luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix --savable invalid C++ on packed arrays, bug1465. 

Signed-off-by: Wilson Snyder <wsnyder@wsnyder.org>
This commit is contained in:
Alex Chadwick 2019-06-14 18:42:27 -04:00 committed by Wilson Snyder
parent ea59a39661
commit 5da5e32e86
4 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -34,6 +34,8 @@ The contributors that suggested a given feature are shown in []. Thanks!
**** Fix not reporting some duplicate signals, bug1462. [Peter Gerst] **** Fix not reporting some duplicate signals, bug1462. [Peter Gerst]
**** Fix --savable invalid C++ on packed arrays, bug1465. [Alex Chadwick]
* Verilator 4.014 2019-05-08 * Verilator 4.014 2019-05-08

1
docs/CONTRIBUTORS
View File

@ -5,6 +5,7 @@ under the Developer Certificate of Origin
Please see the Verilator manual for additional contributors. Please see the Verilator manual for additional contributors.
Jeremy Bennett Jeremy Bennett
Alex Chadwick
John Coiner John Coiner
Kanad Kanhere Kanad Kanhere
Richard Myers Richard Myers

32
src/V3EmitC.cpp
View File

@ -1955,11 +1955,10 @@ void EmitCImp::emitSavableImp(AstNodeModule* modp) {
else if (varp->isStatic() && varp->isConst()) {} else if (varp->isStatic() && varp->isConst()) {}
else { else {
int vects = 0; int vects = 0;
// This isn't very robust and may need cleanup for other data types AstNodeDType* elementp = varp->dtypeSkipRefp();
for (AstUnpackArrayDType* arrayp for (AstUnpackArrayDType* arrayp = VN_CAST(elementp, UnpackArrayDType);
= VN_CAST(varp->dtypeSkipRefp(), UnpackArrayDType);
arrayp; arrayp;
arrayp = VN_CAST(arrayp->subDTypep()->skipRefp(), UnpackArrayDType)) { arrayp = VN_CAST(elementp, UnpackArrayDType)) {
int vecnum = vects++; int vecnum = vects++;
if (arrayp->msb() < arrayp->lsb()) { if (arrayp->msb() < arrayp->lsb()) {
varp->v3fatalSrc("Should have swapped msb & lsb earlier."); varp->v3fatalSrc("Should have swapped msb & lsb earlier.");
@ -1970,19 +1969,22 @@ void EmitCImp::emitSavableImp(AstNodeModule* modp) {
puts("{ int __Vi"+cvtToStr(vecnum)+"="+cvtToStr(0)+";"); puts("{ int __Vi"+cvtToStr(vecnum)+"="+cvtToStr(0)+";");
puts(" for (; "+ivar+"<"+cvtToStr(arrayp->elementsConst())); puts(" for (; "+ivar+"<"+cvtToStr(arrayp->elementsConst()));
puts("; ++"+ivar+") {\n"); puts("; ++"+ivar+") {\n");
elementp = arrayp->subDTypep()->skipRefp();
} }
if (varp->basicp() && (varp->basicp()->keyword() == AstBasicDTypeKwd::STRING // Want to detect types that are represented as arrays
|| !varp->basicp()->isWide())) { // (i.e. packed types of more than 64 bits).
puts("os"+op+varp->name()); AstBasicDType* basicp = elementp->basicp();
for (int v=0; v<vects; ++v) puts( "[__Vi"+cvtToStr(v)+"]"); if (elementp->isWide()
puts(";\n"); && !(basicp && basicp->keyword() == AstBasicDTypeKwd::STRING)) {
} else { int vecnum = vects++;
puts("os."+writeread+"(&"+varp->name()); string ivar = string("__Vi")+cvtToStr(vecnum);
for (int v=0; v<vects; ++v) puts( "[__Vi"+cvtToStr(v)+"]"); puts("{ int __Vi"+cvtToStr(vecnum)+"="+cvtToStr(0)+";");
puts(",sizeof("+varp->name()); puts(" for (; "+ivar+"<"+cvtToStr(elementp->widthWords()));
for (int v=0; v<vects; ++v) puts( "[__Vi"+cvtToStr(v)+"]"); puts("; ++"+ivar+") {\n");
puts("));\n");
} }
puts("os"+op+varp->name());
for (int v=0; v<vects; ++v) puts( "[__Vi"+cvtToStr(v)+"]");
puts(";\n");
for (int v=0; v<vects; ++v) puts( "}}\n"); for (int v=0; v<vects; ++v) puts( "}}\n");
} }
} }

26
test_regress/t/t_savable.v
View File

@ -30,8 +30,10 @@ module sub (/*AUTOARG*/
reg [1:0] save2; reg [1:0] save2;
reg [255:0] cycdone; // Make sure each cycle executes exactly once reg [255:0] cycdone; // Make sure each cycle executes exactly once
reg [31:0] vec[2:1][2:1]; reg [31:0] vec[2:1][2:1];
real r; reg [2:1][2:1][31:0] pvec;
string s,s2; real r;
string s,s2;
string sarr[2:1];
string si; string si;
@ -53,8 +55,14 @@ module sub (/*AUTOARG*/
vec[1][2] <= 32'h0102; vec[1][2] <= 32'h0102;
vec[2][1] <= 32'h0201; vec[2][1] <= 32'h0201;
vec[2][2] <= 32'h0202; vec[2][2] <= 32'h0202;
r <= 1.234; pvec[1][1] <= 32'h10101;
s <= "hello"; pvec[1][2] <= 32'h10102;
pvec[2][1] <= 32'h10201;
pvec[2][2] <= 32'h10202;
r <= 1.234;
s <= "hello";
sarr[1] <= "sarr[1]";
sarr[2] <= "sarr[2]";
end end
if (cyc==1) begin if (cyc==1) begin
if ($test$plusargs("save_restore")!=0) begin if ($test$plusargs("save_restore")!=0) begin
@ -72,8 +80,14 @@ module sub (/*AUTOARG*/
if (vec[1][2] !== 32'h0102) $stop; if (vec[1][2] !== 32'h0102) $stop;
if (vec[2][1] !== 32'h0201) $stop; if (vec[2][1] !== 32'h0201) $stop;
if (vec[2][2] !== 32'h0202) $stop; if (vec[2][2] !== 32'h0202) $stop;
if (r != 1.234) $stop; if (pvec[1][1] !== 32'h10101) $stop;
$display("%s",s); if (pvec[1][2] !== 32'h10102) $stop;
if (pvec[2][1] !== 32'h10201) $stop;
if (pvec[2][2] !== 32'h10202) $stop;
if (r != 1.234) $stop;
$display("%s",s);
$display("%s",sarr[1]);
$display("%s",sarr[2]);
$write("*-* All Finished *-*\n"); $write("*-* All Finished *-*\n");
$finish; $finish;
end end