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

Merge 566e6513eb into e63c4f563e

This commit is contained in:
em2machine 2026-04-08 10:28:02 -04:00 committed by GitHub
parent e63c4f563e 566e6513eb
commit 66e49ed3fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/V3Param.cpp
View File

@ -1326,6 +1326,22 @@ class ParamProcessor final {
}
AstConst* const exprp = VN_CAST(pinp->exprp(), Const);
AstConst* const origp = VN_CAST(modvarp->valuep(), Const);
// Normalize pin width to the port's declared type for naming only.
// A 32-bit literal and a 1-bit substituted value must produce the
// same specialization name. Use subDTypep() since dtypep() is not
// yet set (V3Width has not run).
AstConst* normedNamep = nullptr;
if (exprp && !exprp->num().isDouble() && !exprp->num().isString()
&& !exprp->num().isFourState()) {
const AstNodeDType* const declTypep = modvarp->subDTypep();
const int portWidth = declTypep ? declTypep->skipRefp()->width() : 0;
if (portWidth > 0 && exprp->num().width() != portWidth) {
V3Number normed{exprp, portWidth};
normed.opAssign(exprp->num());
normedNamep = new AstConst{exprp->fileline(), normed};
}
}
AstConst* const namingExprp = normedNamep ? normedNamep : exprp;
if (!exprp) {
// With DepGraph architecture, all expressions should be constants
// by the time V3Param runs. If not, it's an error.
@ -1346,16 +1362,18 @@ class ParamProcessor final {
// This prevents making additional modules, and makes coverage more
// obvious as it won't show up under a unique module page name.
UINFO(9, "cellPinCleanup: same as default " << pinp);
} else if (exprp->num().isDouble() || exprp->num().isString()
|| exprp->num().isFourState() || exprp->num().width() != 32) {
longnamer
+= ("_" + paramSmallName(srcModp, modvarp) + paramValueNumber(exprp));
} else if (namingExprp->num().isDouble() || namingExprp->num().isString()
|| namingExprp->num().isFourState()
|| namingExprp->num().width() != 32) {
longnamer += ("_" + paramSmallName(srcModp, modvarp)
+ paramValueNumber(namingExprp));
any_overridesr = true;
} else {
longnamer
+= ("_" + paramSmallName(srcModp, modvarp) + exprp->num().ascii(false));
longnamer += ("_" + paramSmallName(srcModp, modvarp)
+ namingExprp->num().ascii(false));
any_overridesr = true;
}
if (normedNamep) VL_DO_DANGLING(normedNamep->deleteTree(), normedNamep);
}
} else if (AstParamTypeDType* const modvarp = pinp->modPTypep()) {
// Handle DOT with ParseRef RHS (e.g., p_class#(8)::p_type)