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

Fix crash with misuse of display.

Browse Source
This commit is contained in:
Wilson Snyder 2022-05-15 09:29:15 -04:00
parent 89ec3d16dc
commit ae8d8ee1ac
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/V3EmitCFunc.cpp
View File

@ -308,7 +308,8 @@ void EmitCFunc::displayArg(AstNode* dispp, AstNode** elistp, bool isScan, const
} }
emitDispState.pushFormat(pfmt); emitDispState.pushFormat(pfmt);
if (!ignore) { if (!ignore) {
if (argp->dtypep()->basicp()->keyword() == VBasicDTypeKwd::STRING) { if (argp->dtypep()->basicp()
&& argp->dtypep()->basicp()->keyword() == VBasicDTypeKwd::STRING) {
// string in SystemVerilog is std::string in C++ which is not POD // string in SystemVerilog is std::string in C++ which is not POD
emitDispState.pushArg(' ', nullptr, "-1"); emitDispState.pushArg(' ', nullptr, "-1");
} else { } else {

36
test_regress/t/t_with.v
View File

@ -6,40 +6,52 @@
// any use, without warranty, 2020 by Wilson Snyder. // any use, without warranty, 2020 by Wilson Snyder.
// SPDX-License-Identifier: CC0-1.0 // SPDX-License-Identifier: CC0-1.0
`define stop $stop
`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
module t (/*AUTOARG*/); module t (/*AUTOARG*/);
initial begin initial begin
int tofind; int tofind;
int aliases[$]; int aliases[$];
int found[$]; int found[$];
int id;
int i; int i;
aliases = '{ 1, 4, 6, 8}; aliases = '{ 1, 4, 6, 8};
tofind = 6; tofind = 6;
found = aliases.find with (item == 1); found = aliases.find with (item == 1);
`checkh(found.size, 1);
found = aliases.find(j) with (j == tofind); found = aliases.find(j) with (j == tofind);
`checkh(found.size, 1);
// And as function // And as function
aliases.find(i) with (i == tofind); aliases.find(i) with (i == tofind);
// No parenthesis // No parenthesis
found = aliases.find with (item == i); tofind = 0;
aliases.find with (item == i); found = aliases.find with (item == tofind);
`checkh(found.size, 0);
aliases.find with (item == tofind);
`ifdef VERILATOR // bug3387
// No expression (e.g. x.randomize() with {}) i = aliases.sum();
// Hack until randomize() supported `checkh(i, 'h13);
found = aliases.sort() with {}; i = aliases.sum() with (2'(item));
`endif `checkh(i, 'h3);
// Unique (array method) // Unique (array method)
id = 4; tofind = 4;
found = aliases.find with (id); found = aliases.find with (tofind); // "true" match
found = aliases.find() with (item == id); `checkh(found.size, 4);
found = aliases.find(i) with (i == id); found = aliases.find() with (item == tofind);
`checkh(found.size, 1);
found = aliases.find(i) with (i == tofind);
`checkh(found.size, 1);
i = aliases.or(v) with (v); i = aliases.or(v) with (v);
`checkh(i, 'hf);
i = aliases.and(v) with (v); i = aliases.and(v) with (v);
`checkh(i, 0);
i = aliases.xor(v) with (v); i = aliases.xor(v) with (v);
`checkh(i, 'hb);
$write("*-* All Finished *-*\n"); $write("*-* All Finished *-*\n");
$finish; $finish;