Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

* Fix empty string arguments to display (#3484).

Browse Source
This commit is contained in:
Wilson Snyder 2022-07-09 08:30:57 -04:00
parent a4fddb3fbe
commit 5f3316d3dc
5 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@ -14,6 +14,7 @@ Verilator 4.225 devel
**Minor:** **Minor:**
* Fix incorrect bit op tree optimization (#3470). [algrobman] * Fix incorrect bit op tree optimization (#3470). [algrobman]
* Fix empty string arguments to display (#3484). [Grulfen]
* Fix table misoptimizing away display (#3488). [Stefan Post] * Fix table misoptimizing away display (#3488). [Stefan Post]

58
src/V3LinkResolve.cpp
View File

@ -352,43 +352,45 @@ private:
while (argp) { while (argp) {
if (skipCount) { if (skipCount) {
argp = argp->nextp(); argp = argp->nextp();
skipCount--; --skipCount;
continue; continue;
} }
const AstConst* const constp = VN_CAST(argp, Const); const AstConst* const constp = VN_CAST(argp, Const);
const bool isFromString = (constp) ? constp->num().isFromString() : false; const bool isFromString = (constp) ? constp->num().isFromString() : false;
if (isFromString) { if (isFromString) {
const int numchars = argp->dtypep()->width() / 8; const int numchars = argp->dtypep()->width() / 8;
string str(numchars, ' '); if (!constp->num().toString().empty()) {
// now scan for % operators string str(numchars, ' ');
bool inpercent = false; // now scan for % operators
for (int i = 0; i < numchars; i++) { bool inpercent = false;
const int ii = numchars - i - 1; for (int i = 0; i < numchars; i++) {
const char c = constp->num().dataByte(ii); const int ii = numchars - i - 1;
str[i] = c; const char c = constp->num().dataByte(ii);
if (!inpercent && c == '%') { str[i] = c;
inpercent = true; if (!inpercent && c == '%') {
} else if (inpercent) { inpercent = true;
inpercent = false; } else if (inpercent) {
switch (c) { inpercent = false;
case '0': // FALLTHRU switch (c) {
case '1': // FALLTHRU case '0': // FALLTHRU
case '2': // FALLTHRU case '1': // FALLTHRU
case '3': // FALLTHRU case '2': // FALLTHRU
case '4': // FALLTHRU case '3': // FALLTHRU
case '5': // FALLTHRU case '4': // FALLTHRU
case '6': // FALLTHRU case '5': // FALLTHRU
case '7': // FALLTHRU case '6': // FALLTHRU
case '8': // FALLTHRU case '7': // FALLTHRU
case '9': // FALLTHRU case '8': // FALLTHRU
case '.': inpercent = true; break; case '9': // FALLTHRU
case '%': break; case '.': inpercent = true; break;
default: case '%': break;
if (V3Number::displayedFmtLegal(c, isScan)) ++skipCount; default:
if (V3Number::displayedFmtLegal(c, isScan)) ++skipCount;
}
} }
} }
newFormat.append(str);
} }
newFormat.append(str);
AstNode* const nextp = argp->nextp(); AstNode* const nextp = argp->nextp();
argp->unlinkFrBack(); argp->unlinkFrBack();
VL_DO_DANGLING(pushDeletep(argp), argp); VL_DO_DANGLING(pushDeletep(argp), argp);

2
test_regress/t/t_display_merge.out
View File

@ -1,5 +1,7 @@
Merge: Merge:
This should merge This should merge
Merge:
This should also merge
f f
1=1 a=top.t 1=1 1=1 b=top.t 1=1 1=1 a=top.t 1=1 1=1 b=top.t 1=1
pre pre

2
test_regress/t/t_display_merge.pl
View File

@ -20,7 +20,7 @@ execute(
); );
file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}__stats.txt", file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}__stats.txt",
qr/Node count, DISPLAY \s+ 41 \s+ 27 \s+ 27 \s+ 6/); qr/Node count, DISPLAY \s+ 44 \s+ 27 \s+ 27 \s+ 6/);
ok(1); ok(1);
1; 1;

4
test_regress/t/t_display_merge.v
View File

@ -19,6 +19,10 @@ module t (/*AUTOARG*/);
$write("should "); $write("should ");
$display("merge"); $display("merge");
$display("Merge:");
$write("This ", "", "should ", "", "also ");
$display("merge");
$display("f"); $display("f");
$write(" 1=%0d a=%m 1=%0d", one, one); $write(" 1=%0d a=%m 1=%0d", one, one);
$display(" 1=%0d b=%m 1=%0d", one, one); $display(" 1=%0d b=%m 1=%0d", one, one);