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

Fix public function arguments that are arrayed (#3316).

Browse Source
This commit is contained in:
Wilson Snyder 2022-03-05 16:19:53 -05:00
parent 321880f5a6
commit c3dd6f5344
3 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@ -19,6 +19,7 @@ Verilator 4.219 devel
* Add trace dumpvars() call for selective runtime tracing (#3322). [Shunyao CAD] * Add trace dumpvars() call for selective runtime tracing (#3322). [Shunyao CAD]
* Fix skipping public enum values with four-state values (#3303). * Fix skipping public enum values with four-state values (#3303).
* Fix $readmem file not found to be warning not error (#3310). [Alexander Grobman] * Fix $readmem file not found to be warning not error (#3310). [Alexander Grobman]
* Fix public function arguments that are arrayed (#3316). [pawel256]
* Fix compile error with --trace-fst --sc (#3332). [leavinel] * Fix compile error with --trace-fst --sc (#3332). [leavinel]
* Fix crash in recursive module inlining (#3324). [Larry Doolittle] * Fix crash in recursive module inlining (#3324). [Larry Doolittle]

42
src/V3AstNodes.cpp
View File

@ -454,25 +454,33 @@ string AstVar::cPubArgType(bool named, bool forReturn) const {
if (forReturn) named = false; if (forReturn) named = false;
string arg; string arg;
if (isWide() && isReadOnly()) arg += "const "; if (isWide() && isReadOnly()) arg += "const ";
if (widthMin() == 1) { const bool isRef = !forReturn && (isWritable() || direction().isRefOrConstRef());
arg += "bool"; if (VN_IS(dtypeSkipRefp(), BasicDType) && !dtypeSkipRefp()->isDouble()
} else if (widthMin() <= VL_IDATASIZE) { && !dtypeSkipRefp()->isString()) {
arg += "uint32_t"; // Backward compatible type declaration
} else if (widthMin() <= VL_QUADSIZE) { if (widthMin() == 1) {
arg += "vluint64_t"; arg += "bool";
} else { } else if (widthMin() <= VL_IDATASIZE) {
arg += "uint32_t"; // []'s added later arg += "uint32_t";
} } else if (widthMin() <= VL_QUADSIZE) {
if (isWide()) { arg += "vluint64_t";
if (forReturn) { } else {
v3warn(E_UNSUPPORTED, "Unsupported: Public functions with >64 bit outputs; " arg += "uint32_t"; // []'s added later
"make an output of a public task instead"); }
if (isWide()) {
if (forReturn) {
v3warn(E_UNSUPPORTED, "Unsupported: Public functions with >64 bit outputs; "
"make an output of a public task instead");
}
arg += " (& " + name();
arg += ")[" + cvtToStr(widthWords()) + "]";
} else {
if (isRef) arg += "&";
if (named) arg += " " + name();
} }
arg += " (& " + name();
arg += ")[" + cvtToStr(widthWords()) + "]";
} else { } else {
if (!forReturn && (isWritable() || direction().isRefOrConstRef())) arg += "&"; // Newer internal-compatible types
if (named) arg += " " + name(); arg += dtypep()->cType((named ? name() : string{}), true, isRef);
} }
return arg; return arg;
} }

7
test_regress/t/t_func_public.v
View File

@ -32,6 +32,13 @@ module t (clk);
$write("Hello in publicTop\n"); $write("Hello in publicTop\n");
endtask endtask
task test_task(input [19:0] in [2], output [19:0] out [2]);
// Issue 3316
// verilator public
out[0] = in[1];
out[1] = in[0];
endtask
endmodule endmodule
module tpub ( module tpub (