luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix passing parameter type instantiations by position number.

This commit is contained in:
Wilson Snyder 2020-12-05 10:59:33 -05:00
parent 7f6d4ac359
commit 5fb834e41e
4 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -5,6 +5,8 @@ The contributors that suggested a given feature are shown in []. Thanks!
* Verilator 4.107 devel * Verilator 4.107 devel
**** Fix passing parameter type instantiations by position number.
* Verilator 4.106 2020-12-02 * Verilator 4.106 2020-12-02

8
src/V3LinkDot.cpp
View File

@ -1161,7 +1161,7 @@ class LinkDotFindVisitor final : public AstNVisitor {
VSymEnt* insp VSymEnt* insp
= m_statep->insertSym(m_curSymp, nodep->name(), nodep, m_classOrPackagep); = m_statep->insertSym(m_curSymp, nodep->name(), nodep, m_classOrPackagep);
if (m_statep->forPrimary() && nodep->isGParam()) { if (m_statep->forPrimary() && nodep->isGParam()) {
m_paramNum++; ++m_paramNum;
VSymEnt* symp VSymEnt* symp
= m_statep->insertSym(m_curSymp, "__paramNumber" + cvtToStr(m_paramNum), = m_statep->insertSym(m_curSymp, "__paramNumber" + cvtToStr(m_paramNum),
nodep, m_classOrPackagep); nodep, m_classOrPackagep);
@ -1191,6 +1191,12 @@ class LinkDotFindVisitor final : public AstNVisitor {
UASSERT_OBJ(m_curSymp, nodep, "Parameter type not under module/package/$unit"); UASSERT_OBJ(m_curSymp, nodep, "Parameter type not under module/package/$unit");
iterateChildren(nodep); iterateChildren(nodep);
m_statep->insertSym(m_curSymp, nodep->name(), nodep, m_classOrPackagep); m_statep->insertSym(m_curSymp, nodep->name(), nodep, m_classOrPackagep);
if (m_statep->forPrimary() && nodep->isGParam()) {
++m_paramNum;
VSymEnt* symp = m_statep->insertSym(m_curSymp, "__paramNumber" + cvtToStr(m_paramNum),
nodep, m_classOrPackagep);
symp->exported(false);
}
} }
virtual void visit(AstCFunc* nodep) override { virtual void visit(AstCFunc* nodep) override {
// For dotted resolution, ignore all AstVars under functions, otherwise shouldn't exist // For dotted resolution, ignore all AstVars under functions, otherwise shouldn't exist

3
test_regress/t/t_class_vparam.out
View File

@ -1,7 +1,4 @@
%Error-UNSUPPORTED: t/t_class_vparam.v:13:40: Unsupported: parameterized packages %Error-UNSUPPORTED: t/t_class_vparam.v:13:40: Unsupported: parameterized packages
13 | pure virtual function void funcname(paramed_class_t #(CTYPE_t) v); 13 | pure virtual function void funcname(paramed_class_t #(CTYPE_t) v);
| ^~~~~~~~~~~~~~~ | ^~~~~~~~~~~~~~~
%Error: t/t_class_vparam.v:13:58: Parameter pin not found: '__paramNumber1'
13 | pure virtual function void funcname(paramed_class_t #(CTYPE_t) v);
| ^~~~~~~
%Error: Exiting due to %Error: Exiting due to

24
test_regress/t/t_param_type3.v
View File

@ -17,32 +17,42 @@ module t (/*AUTOARG*/
output T_t o; output T_t o;
output T_t o2; output T_t o2;
sub #(.T_t(T_t)) sub1 #(.T_t(T_t), .CHECK(1))
sub (.i, .o); sub1 (.i, .o);
sub2 #(.T_t(T_t)) sub2 #(.T_t(T_t), .CHECK(2))
sub2 (.i, .o(o2)); sub2 (.i, .o(o2));
sub1 #(T_t, 1)
sub1b (i, o);
sub2 #(T_t, 2)
sub2b (i, o2);
endmodule endmodule
module sub (i,o); module sub1 (i,o);
parameter type T_t = logic; parameter type T_t = real;
localparam type T2_t = T_t; localparam type T2_t = T_t;
parameter int CHECK = 0;
input T_t i; input T_t i;
output T2_t o; output T2_t o;
assign o = i; assign o = i;
if (CHECK != 1) $error;
endmodule endmodule
module sub2 module sub2
#( #(
parameter type T_t = logic, parameter type T_t = real,
localparam type T2_t = T_t localparam type T2_t = T_t,
parameter int CHECK = 0
) )
( (
input T_t i, input T_t i,
output T_t o output T_t o
); );
assign o = i; assign o = i;
if (CHECK != 2) $error;
endmodule endmodule
// Local Variables: // Local Variables: