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

Fix little endian packed array pattern assignment (#2795).

This commit is contained in:
Wilson Snyder 2021-02-20 20:29:28 -05:00
parent 62e877ebf0
commit 975c1b39a9
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -17,6 +17,8 @@ The contributors that suggested a given feature are shown in []. Thanks!
**** Fix examples not flushing vcd (#2787). [Richard E George] **** Fix examples not flushing vcd (#2787). [Richard E George]
**** Fix little endian packed array pattern assignment (#2795). [Alex Torregrosa]
* Verilator 4.108 2021-01-10 * Verilator 4.108 2021-01-10

5
src/V3Width.cpp
View File

@ -3427,9 +3427,10 @@ private:
void patternArray(AstPattern* nodep, AstNodeArrayDType* arrayDtp, AstPatMember* defaultp) { void patternArray(AstPattern* nodep, AstNodeArrayDType* arrayDtp, AstPatMember* defaultp) {
VNumRange range = arrayDtp->declRange(); VNumRange range = arrayDtp->declRange();
PatVecMap patmap = patVectorMap(nodep, range); PatVecMap patmap = patVectorMap(nodep, range);
UINFO(9, "ent " << range.hi() << " to " << range.lo() << endl); UINFO(9, "ent " << range.left() << " to " << range.right() << endl);
AstNode* newp = nullptr; AstNode* newp = nullptr;
for (int ent = range.hi(); ent >= range.lo(); --ent) { for (int entn = 0, ent = range.left(); entn < range.elements();
++entn, ent += range.leftToRightInc()) {
AstPatMember* newpatp = nullptr; AstPatMember* newpatp = nullptr;
AstPatMember* patp = nullptr; AstPatMember* patp = nullptr;
const auto it = patmap.find(ent); const auto it = patmap.find(ent);

24
test_regress/t/t_array_packed_endian.v
View File

@ -28,6 +28,13 @@ typedef struct packed {
// verilator lint_on LITENDIAN // verilator lint_on LITENDIAN
} t2; } t2;
logic [2:0][31:0] test2l;
// verilator lint_off LITENDIAN
logic [0:2][31:0] test2b;
logic [0:2][31:0] test1b;
// verilator lint_on LITENDIAN
logic [2:0][31:0] test1l;
module t; module t;
t2 t; t2 t;
initial begin initial begin
@ -65,6 +72,23 @@ module t;
t.dl[7] = 1'b1; t.dl[7] = 1'b1;
`checkh(t, 80'h80_0002040000100800_01); `checkh(t, 80'h80_0002040000100800_01);
test1b = '{0, 1, 2};
test1l = test1b;
test2l = '{2, 1, 0};
test2b = test2l;
`checkh(test2l[0], 0);
`checkh(test2l[2], 2);
`checkh(test2l, {32'h2, 32'h1, 32'h0});
`checkh(test2b[0], 2);
`checkh(test2b[2], 0);
`checkh(test2b, {32'h2, 32'h1, 32'h0});
`checkh(test1b[0], 0);
`checkh(test1b[2], 2);
`checkh(test1b, {32'h0, 32'h1, 32'h2});
`checkh(test1l[0], 2);
`checkh(test1l[2], 0);
`checkh(test1l, {32'h0, 32'h1, 32'h2});
$write("*-* All Finished *-*\n"); $write("*-* All Finished *-*\n");
$finish; $finish;
end end