github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-01 12:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix $display with string without %s, bug1441.

Browse Source
This commit is contained in:
Wilson Snyder 2019-05-16 21:21:38 -04:00
parent d841e68f4f
commit 01725f662f
5 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -14,6 +14,8 @@ The contributors that suggested a given feature are shown in []. Thanks!
**** Fix fault on $realtime with %t, bug1443. [Julien Margetts]
**** Fix $display with string without %s, bug1441. [Denis Rystsov]
**** Fix parameter function string returns, bug1441. [Denis Rystsov]

14
src/V3LinkResolve.cpp
View File

@ -341,13 +341,13 @@ private:
AstNode *nextp = argp->nextp();
argp->unlinkFrBack(); pushDeletep(argp); VL_DANGLING(argp);
argp = nextp;
} else {
newFormat.append("%h");
argp = argp->nextp();
}
}
}
return newFormat;
} else {
newFormat.append("%?"); // V3Width to figure it out
argp = argp->nextp();
}
}
}
return newFormat;
}
void expectDescriptor(AstNode* nodep, AstNodeVarRef* filep) {

11
src/V3Width.cpp
View File

@ -2179,6 +2179,17 @@ private:
if (argp) argp = argp->nextp();
break;
}
case '?': { // Unspecified by user, guess
if (argp && argp->isDouble()) {
ch = 'g';
} else if (argp && argp->isString()) {
ch = '@';
} else {
ch = 'h';
}
if (argp) argp = argp->nextp();
break;
}
default: { // Most operators, just move to next argument
if (argp) argp=argp->nextp();
break;

2
test_regress/t/t_display_string.out
View File

@ -1,5 +1,7 @@
String: ' 1'
foo(1): ' 1'
s f(1): ' 1'
s parm: ' 1'
s strg: ' 1'
r: 1.234
*-* All Finished *-*

4
test_regress/t/t_display_string.v
View File

@ -7,14 +7,16 @@ module t;
function automatic string foo(int i);
return $sformatf("'%d'", i); // %0d does not work here
endfunction
real r = 1.234;
string bar = foo(1);
localparam string pbar = foo(1);
initial begin
$write("String: "); $display("' 1'");
//$write("foo(1): "); $display(foo(1));
$write("foo(1): "); $display(foo(1));
$write("s f(1): "); $display("%s", foo(1));
$write("s parm: "); $display("%s", pbar);
$write("s strg: "); $display("%s", bar);
$write("r: "); $display(r);
$write("*-* All Finished *-*\n");
$finish;
end