luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-08-31 18:14:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Internals: Use pure expressions in V3Randomize (#6974)

Browse Source
This commit is contained in:
Geza Lore
2026-02-01 05:09:19 +00:00
committed by GitHub
parent 122ceb2258
commit f0afcede10
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3Randomize.cpp
+9 -8
View File
@@ -901,8 +901,7 @@ class ConstraintExprVisitor final : public VNVisitor {
AstNodeExpr* exprp;
if (randMode.usesMode) {
// Use string literal to avoid double formatting
exprp = new AstCExpr{nodep->fileline(), "std::string(\"" + smtName + "\")", 1};
exprp->dtypeSetString();
exprp = new AstConst{nodep->fileline(), AstConst::String{}, smtName};
// Get const format, using membersel if available for correct width/value
AstNodeExpr* constFormatp
@@ -1003,8 +1002,8 @@ class ConstraintExprVisitor final : public VNVisitor {
const size_t width = tmpDtypep->width();
methodp->addPinsp(
new AstConst{varp->dtypep()->fileline(), AstConst::Unsized64{}, width});
AstNodeExpr* const varnamep
= new AstCExpr{varp->fileline(), "\"" + smtName + "\"", varp->width()};
AstNodeExpr* const varnamep = new AstCExpr{varp->fileline(), AstCExpr::Pure{},
"\"" + smtName + "\"", varp->width()};
varnamep->dtypep(varp->dtypep());
methodp->addPinsp(varnamep);
methodp->addPinsp(
@@ -1434,10 +1433,11 @@ class ConstraintExprVisitor final : public VNVisitor {
// Pass filename, lineno, and source as separate arguments
// This allows EmitC to call protect() on filename, similar to VL_STOP
// Add filename parameter
callp->addPinsp(
new AstCExpr{nodep->fileline(), "\"" + nodep->fileline()->filename() + "\""});
callp->addPinsp(new AstCExpr{nodep->fileline(), AstCExpr::Pure{},
"\"" + nodep->fileline()->filename() + "\""});
// Add line number parameter
callp->addPinsp(new AstCExpr{nodep->fileline(), cvtToStr(nodep->fileline()->lineno())});
const uint32_t lineno = static_cast<uint32_t>(nodep->fileline()->lineno());
callp->addPinsp(new AstConst{nodep->fileline(), lineno});
// Add source text parameter (empty if --protect-ids to avoid source leakage)
std::string prettyText;
if (!v3Global.opt.protectIds()) {
@@ -1448,7 +1448,8 @@ class ConstraintExprVisitor final : public VNVisitor {
pos += std::strlen("\\\"");
}
}
callp->addPinsp(new AstCExpr{nodep->fileline(), "\"" + prettyText + "\""});
callp->addPinsp(
new AstCExpr{nodep->fileline(), AstCExpr::Pure{}, "\"" + prettyText + "\""});
nodep->replaceWith(callp->makeStmt());
VL_DO_DANGLING(nodep->deleteTree(), nodep);
}