github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-04 19:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unpacked-in-class array reference assignments

Browse Source
This commit is contained in:
Wilson Snyder 2021-03-13 13:04:13 -05:00
parent ce79c4ebf9
commit e3788e871e
6 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/V3AstNodes.cpp
View File

@ -788,7 +788,7 @@ int AstNodeDType::widthPow2() const {
}
/// What is the base variable (or const) this dereferences?
AstNode* AstArraySel::baseFromp(AstNode* nodep) {
AstNode* AstArraySel::baseFromp(AstNode* nodep, bool overMembers) {
// Else AstArraySel etc; search for the base
while (nodep) {
if (VN_IS(nodep, ArraySel)) {
@ -797,6 +797,9 @@ AstNode* AstArraySel::baseFromp(AstNode* nodep) {
} else if (VN_IS(nodep, Sel)) {
nodep = VN_CAST(nodep, Sel)->fromp();
continue;
} else if (overMembers && VN_IS(nodep, MemberSel)) {
nodep = VN_CAST(nodep, MemberSel)->fromp();
continue;
}
// AstNodeSelPre stashes the associated variable under an ATTROF
// of AstAttrType::VAR_BASE/MEMBER_BASE so it isn't constified

4
src/V3AstNodes.h
View File

@ -1595,8 +1595,8 @@ public:
virtual bool same(const AstNode* samep) const override { return true; }
virtual int instrCount() const override { return widthInstrs(); }
// Special operators
static AstNode*
baseFromp(AstNode* nodep); ///< What is the base variable (or const) this dereferences?
// Return base var (or const) nodep dereferences
static AstNode* baseFromp(AstNode* nodep, bool overMembers);
};
class AstAssocSel final : public AstNodeSel {

2
src/V3LinkResolve.cpp
View File

@ -218,7 +218,7 @@ private:
// variable we're extracting from (to determine MSB/LSB/endianness/etc.)
// So we replicate it in another node
// Note that V3Param knows not to replace AstVarRef's under AstAttrOf's
AstNode* basefromp = AstArraySel::baseFromp(nodep);
AstNode* basefromp = AstArraySel::baseFromp(nodep, false);
if (AstNodeVarRef* varrefp
= VN_CAST(basefromp, NodeVarRef)) { // Maybe varxref - so need to clone
nodep->attrp(new AstAttrOf(nodep->fileline(), AstAttrType::VAR_BASE,

4
src/V3Unknown.cpp
View File

@ -357,7 +357,7 @@ private:
iterateChildren(nodep);
if (!nodep->user1SetOnce()) {
// Guard against reading/writing past end of bit vector array
AstNode* basefromp = AstArraySel::baseFromp(nodep);
AstNode* basefromp = AstArraySel::baseFromp(nodep, true);
bool lvalue = false;
if (const AstNodeVarRef* varrefp = VN_CAST(basefromp, NodeVarRef)) {
lvalue = varrefp->access().isWriteOrRW();
@ -405,7 +405,7 @@ private:
if (!nodep->user1SetOnce()) {
if (debug() == 9) nodep->dumpTree(cout, "-in: ");
// Guard against reading/writing past end of arrays
AstNode* basefromp = AstArraySel::baseFromp(nodep->fromp());
AstNode* basefromp = AstArraySel::baseFromp(nodep->fromp(), true);
bool lvalue = false;
if (const AstNodeVarRef* varrefp = VN_CAST(basefromp, NodeVarRef)) {
lvalue = varrefp->access().isWriteOrRW();

2
test_regress/t/t_class_format.out
View File

@ -1,2 +1,2 @@
''{b:'h1, i:'h2a, carray4:'{'h0, 'h0, 'h0, 'h0} }'
''{b:'h1, i:'h2a, carray4:'{'h11, 'h22, 'h33, 'h44} }'
*-* All Finished *-*

5
test_regress/t/t_class_format.v
View File

@ -23,6 +23,11 @@ module t (/*AUTOARG*/);
c = new;
c.b = '1;
c.i = 42;
c.carray4[0] = 16'h11;
c.carray4[1] = 16'h22;
c.carray4[2] = 16'h33;
c.carray4[3] = 16'h44;
$display("'%p'", c);
$write("*-* All Finished *-*\n");