github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 20:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'for' loop with outside variable reference (#4660).

Browse Source
This commit is contained in:
Wilson Snyder 2023-12-24 10:17:44 -05:00
parent 540cd772e4
commit 54ad04b6e9
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/V3Simulate.h
View File

@ -559,7 +559,8 @@ private:
AstNode* const valuep = nodep->itemp()->valuep();
if (valuep) {
iterateAndNextConstNull(valuep);
if (optimizable()) newValue(nodep, fetchValue(valuep));
if (!optimizable()) return;
newValue(nodep, fetchValue(valuep));
} else {
clearOptimizable(nodep, "No value found for enum item"); // LCOV_EXCL_LINE
}
@ -611,13 +612,13 @@ private:
iterateChildrenConst(nodep);
} else {
iterateConst(nodep->lhsp());
if (optimizable()) {
if (fetchConst(nodep->lhsp())->num().isNeqZero()) {
iterateConst(nodep->rhsp());
newValue(nodep, fetchValue(nodep->rhsp()));
} else {
newValue(nodep, fetchValue(nodep->lhsp())); // a zero
}
if (!optimizable()) return;
if (fetchConst(nodep->lhsp())->num().isNeqZero()) {
iterateConst(nodep->rhsp());
if (!optimizable()) return;
newValue(nodep, fetchValue(nodep->rhsp()));
} else {
newValue(nodep, fetchValue(nodep->lhsp())); // a zero
}
}
}
@ -629,13 +630,13 @@ private:
iterateChildrenConst(nodep);
} else {
iterateConst(nodep->lhsp());
if (optimizable()) {
if (fetchConst(nodep->lhsp())->num().isNeqZero()) {
newValue(nodep, fetchValue(nodep->lhsp())); // a one
} else {
iterateConst(nodep->rhsp());
newValue(nodep, fetchValue(nodep->rhsp()));
}
if (!optimizable()) return;
if (fetchConst(nodep->lhsp())->num().isNeqZero()) {
newValue(nodep, fetchValue(nodep->lhsp())); // a one
} else {
iterateConst(nodep->rhsp());
if (!optimizable()) return;
newValue(nodep, fetchValue(nodep->rhsp()));
}
}
}
@ -647,15 +648,14 @@ private:
iterateChildrenConst(nodep);
} else {
iterateConst(nodep->lhsp());
if (optimizable()) {
if (fetchConst(nodep->lhsp())->num().isEqZero()) {
const AstConst cnst{nodep->fileline(), AstConst::WidthedValue{}, 1,
1}; // a one
newValue(nodep, &cnst); // a one
} else {
iterateConst(nodep->rhsp());
newValue(nodep, fetchValue(nodep->rhsp()));
}
if (!optimizable()) return;
if (fetchConst(nodep->lhsp())->num().isEqZero()) {
const AstConst cnst{nodep->fileline(), AstConst::WidthedValue{}, 1, 1}; // a one
newValue(nodep, &cnst); // a one
} else {
iterateConst(nodep->rhsp());
if (!optimizable()) return;
newValue(nodep, fetchValue(nodep->rhsp()));
}
}
}
@ -816,10 +816,9 @@ private:
iterateChildrenConst(nodep);
} else if (optimizable()) {
iterateAndNextConstNull(nodep->rhsp());
if (optimizable()) {
AstNode* const vscp = varOrScope(VN_CAST(nodep->lhsp(), VarRef));
assignOutValue(nodep, vscp, fetchValue(nodep->rhsp()));
}
if (!optimizable()) return;
AstNode* const vscp = varOrScope(VN_CAST(nodep->lhsp(), VarRef));
assignOutValue(nodep, vscp, fetchValue(nodep->rhsp()));
}
}
void visit(AstArraySel* nodep) override {

1
test_regress/t/t_unroll_unopt_io.pl
View File

@ -11,6 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1);
compile(
verilator_flags2 => ['--x-assign fast'],
);
ok(1);