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

Fix $fopen etc on integer arrays (#3214).

Browse Source
This commit is contained in:
Wilson Snyder 2021-11-23 18:22:16 -05:00
parent c14bbb9421
commit e7ebe0e280
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@ -26,6 +26,7 @@ Verilator 4.215 devel
* Fix display of signed without format (#3204). [Julie Schwartz] * Fix display of signed without format (#3204). [Julie Schwartz]
* Fix display of empty string constant (#3207). [Julie Schwartz] * Fix display of empty string constant (#3207). [Julie Schwartz]
* Fix incorrect width after and-or optimization (#3208). [Julie Schwartz] * Fix incorrect width after and-or optimization (#3208). [Julie Schwartz]
* Fix $fopen etc on integer arrays (#3214). [adrienlemasle]
* Fix %0 format on $value$plusargs. * Fix %0 format on $value$plusargs.

2
src/V3EmitCFunc.cpp
View File

@ -679,7 +679,7 @@ string EmitCFunc::emitVarResetRecurse(const AstVar* varp, const string& varNameP
return ""; return "";
} else if (basicp) { } else if (basicp) {
bool zeroit bool zeroit
= (varp->attrFileDescr() // Zero so we don't core dump if never $fopen = (varp->attrFileDescr() // Zero so we don't do file IO if never $fopen
|| (basicp && basicp->isZeroInit()) || (basicp && basicp->isZeroInit())
|| (v3Global.opt.underlineZero() && !varp->name().empty() && varp->name()[0] == '_') || (v3Global.opt.underlineZero() && !varp->name().empty() && varp->name()[0] == '_')
|| (v3Global.opt.xInitial() == "fast" || v3Global.opt.xInitial() == "0")); || (v3Global.opt.xInitial() == "fast" || v3Global.opt.xInitial() == "0"));

6
src/V3LinkResolve.cpp
View File

@ -403,10 +403,8 @@ private:
} }
static void expectDescriptor(AstNode* nodep, AstNodeVarRef* filep) { static void expectDescriptor(AstNode* nodep, AstNodeVarRef* filep) {
if (!filep) { // This might fail on complex expressions like arrays
nodep->v3warn(E_UNSUPPORTED, // We use attrFileDescr() only for lint suppression, so that's ok
"Unsupported: $fopen/$fclose/$f* descriptor must be a simple variable");
}
if (filep && filep->varp()) filep->varp()->attrFileDescr(true); if (filep && filep->varp()) filep->varp()->attrFileDescr(true);
} }

7
test_regress/t/t_sys_file_basic.v
View File

@ -14,6 +14,7 @@
module t; module t;
integer file; integer file;
integer file_a[0];
integer chars; integer chars;
reg [1*8:1] letterl; reg [1*8:1] letterl;
@ -91,8 +92,10 @@ module t;
begin begin
// Check quadword access; a little strange, but it's legal to open "." // Check quadword access; a little strange, but it's legal to open "."
file = $fopen(".","r"); // Also checks using array reference
$fclose(file); file_a[0] = $fopen(".","r");
if (file_a[0] == 0) $stop;
$fclose(file_a[0]);
end end
begin begin