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

Fix $sformat with array arguments (#5330).

This commit is contained in:
Wilson Snyder 2024-08-08 03:32:07 -04:00
parent 18fc3e6089
commit c2e44dbd99
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@ -57,6 +57,7 @@ Verilator 5.027 devel
* Fix Python3 path discovery in make flows to avoid mixing system and user python interpreters (#5307) [Markus Krause] * Fix Python3 path discovery in make flows to avoid mixing system and user python interpreters (#5307) [Markus Krause]
* Fix make flows to pass PYTHON3 (like PERL) (#5307) (#5308). [Markus Krause] * Fix make flows to pass PYTHON3 (like PERL) (#5307) (#5308). [Markus Krause]
* Fix stringify in nested preprocessor macros (#5323). [Krzysztof Bieganski, Antmicro Ltd.] * Fix stringify in nested preprocessor macros (#5323). [Krzysztof Bieganski, Antmicro Ltd.]
* Fix $sformat with array arguments (#5330). [Abe Jordan]
* Fix ==? and !=? with X values. * Fix ==? and !=? with X values.
* Fix CPU time being zero. * Fix CPU time being zero.
* Fix inline function ref port persistence. * Fix inline function ref port persistence.

7
src/V3Width.cpp
View File

@ -1203,7 +1203,7 @@ class WidthVisitor final : public VNVisitor {
userIterateAndNext(nodep->attrp(), WidthVP{SELF, BOTH}.p()); userIterateAndNext(nodep->attrp(), WidthVP{SELF, BOTH}.p());
AstNode* const selp = V3Width::widthSelNoIterEdit(nodep); AstNode* const selp = V3Width::widthSelNoIterEdit(nodep);
if (selp != nodep) { if (selp != nodep) {
nodep = nullptr; VL_DANGLING(nodep);
userIterate(selp, m_vup); userIterate(selp, m_vup);
return; return;
} }
@ -5051,6 +5051,11 @@ class WidthVisitor final : public VNVisitor {
} }
} }
void visit(AstSFormat* nodep) override {
assertAtStatement(nodep);
userIterateAndNext(nodep->fmtp(), WidthVP{SELF, BOTH}.p());
userIterateAndNext(nodep->lhsp(), WidthVP{SELF, BOTH}.p());
}
void visit(AstSFormatF* nodep) override { void visit(AstSFormatF* nodep) override {
// Excludes NodeDisplay, see below // Excludes NodeDisplay, see below
if (m_vup && !m_vup->prelim()) return; // Can be called as statement or function if (m_vup && !m_vup->prelim()) return; // Can be called as statement or function

6
test_regress/t/t_sys_sformat.v
View File

@ -17,6 +17,7 @@ module t;
reg [48*8:1] str2; reg [48*8:1] str2;
string str3; string str3;
reg [39:0] instruction_str [1:0];
real r; real r;
@ -87,6 +88,11 @@ module t;
`ifdef TEST_VERBOSE $display("str3=%0s", str3); `endif `ifdef TEST_VERBOSE $display("str3=%0s", str3); `endif
if (str3 != "foo") $stop; if (str3 != "foo") $stop;
$sformat(instruction_str[0], "%s", "Hello");
$sformat(instruction_str[1], "%s", "World");
if (instruction_str[0] != "Hello") $stop;
if (instruction_str[1] != "World") $stop;
$write("*-* All Finished *-*\n"); $write("*-* All Finished *-*\n");
$finish; $finish;
end end