luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-10-06 10:03:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Internals: UINFO now includes newline itself. No functional change.

Browse Source
This commit is contained in:
Wilson Snyder
2025-05-22 20:29:32 -04:00
parent 091be59f0d
commit 46c7b69c64
129 changed files with 1259 additions and 1287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3Descope.cpp
+11 -12
View File
@@ -97,9 +97,9 @@ class DescopeVisitor final : public VNVisitor {
// Static functions can't use relative references via 'this->'
const bool relativeRefOk = !m_funcp->isStatic();
UINFO(8, " Descope ref under " << m_scopep << endl);
UINFO(8, " ref to " << scopep << endl);
UINFO(8, " aboveScope " << scopep->aboveScopep() << endl);
UINFO(8, " Descope ref under " << m_scopep);
UINFO(8, " ref to " << scopep);
UINFO(8, " aboveScope " << scopep->aboveScopep());
if (VN_IS(scopep->modp(), Class)) {
// Direct reference to class members are from within the class itself, references from
@@ -133,7 +133,7 @@ class DescopeVisitor final : public VNVisitor {
const bool moreOfSame1 = (nextIt1 != m_modFuncs.end() && nextIt1->first == name);
if (moreOfSame1) {
// Multiple functions under this name, need a wrapper function
UINFO(6, " Wrapping " << name << " multifuncs\n");
UINFO(6, " Wrapping " << name << " multifuncs");
AstCFunc* const newfuncp = topFuncp->cloneTree(false);
if (newfuncp->initsp()) newfuncp->initsp()->unlinkFrBackWithNext()->deleteTree();
if (newfuncp->stmtsp()) newfuncp->stmtsp()->unlinkFrBackWithNext()->deleteTree();
@@ -152,9 +152,8 @@ class DescopeVisitor final : public VNVisitor {
= (nextIt2 != m_modFuncs.end() && nextIt2->first == name);
UASSERT_OBJ(funcp->scopep(), funcp, "Not scoped");
UINFO(6, " Wrapping " << name << " " << funcp << endl);
UINFO(6,
" at " << newfuncp->argTypes() << " und " << funcp->argTypes() << endl);
UINFO(6, " Wrapping " << name << " " << funcp);
UINFO(6, " at " << newfuncp->argTypes() << " und " << funcp->argTypes());
funcp->declPrivate(true);
AstVarRef* argsp = nullptr;
for (AstNode* stmtp = newfuncp->argsp(); stmtp; stmtp = stmtp->nextp()) {
@@ -199,7 +198,7 @@ class DescopeVisitor final : public VNVisitor {
if (debug() >= 9) newfuncp->dumpTree("- newfunc: ");
} else {
// Only a single function under this name, we can rename it
UINFO(6, " Wrapping " << name << " just one " << topFuncp << endl);
UINFO(6, " Wrapping " << name << " just one " << topFuncp);
topFuncp->name(name);
}
}
@@ -231,7 +230,7 @@ class DescopeVisitor final : public VNVisitor {
return;
}
// Convert the hierch name
UINFO(9, " ref-in " << nodep << endl);
UINFO(9, " ref-in " << nodep);
UASSERT_OBJ(m_scopep, nodep, "Node not under scope");
const AstVar* const varp = nodep->varScopep()->varp();
const AstScope* const scopep = nodep->varScopep()->scopep();
@@ -245,10 +244,10 @@ class DescopeVisitor final : public VNVisitor {
nodep->selfPointer(descopedSelfPointer(scopep));
}
nodep->varScopep(nullptr);
UINFO(9, " refout " << nodep << " selfPtr=" << nodep->selfPointer().asString() << endl);
UINFO(9, " refout " << nodep << " selfPtr=" << nodep->selfPointer().asString());
}
void visit(AstCCall* nodep) override {
// UINFO(9, " " << nodep << endl);
// UINFO(9, " " << nodep);
iterateChildren(nodep);
// Convert the hierch name
UASSERT_OBJ(m_scopep, nodep, "Node not under scope");
@@ -295,7 +294,7 @@ public:
// Descope class functions
void V3Descope::descopeAll(AstNetlist* nodep) {
UINFO(2, __FUNCTION__ << ": " << endl);
UINFO(2, __FUNCTION__ << ":");
{ DescopeVisitor{nodep}; } // Destruct before checking
V3Global::dumpCheckGlobalTree("descope", 0, dumpTreeEitherLevel() >= 3);
}