mirror of
https://github.com/verilator/verilator.git
synced 2025-04-05 12:12:39 +00:00
Internals: Show tree traversal in V3LinkDot Resolve debug. No functional change intended.
This commit is contained in:
Wilson Snyder
parent
90215878f8
commit
2584befa5a
@ -2131,6 +2131,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
AstNodeFTask* m_ftaskp = nullptr; // Current function/task
|
||||
AstMethodCall* m_randMethodCallp = nullptr; // Current randomize() method call
|
||||
int m_modportNum = 0; // Uniqueify modport numbers
|
||||
int m_indent = 0; // Indentation (tree depth) for debug
|
||||
bool m_inSens = false; // True if in senitem
|
||||
bool m_inWith = false; // True if in with
|
||||
std::map<std::string, AstNode*> m_ifClassImpNames; // Names imported from interface class
|
||||
@ -2255,7 +2256,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
void checkNoDot(AstNode* nodep) {
|
||||
if (VL_UNLIKELY(m_ds.m_dotPos != DP_NONE)) {
|
||||
// UINFO(9, "ds=" << m_ds.ascii() << endl);
|
||||
// UINFO(9, indent() << "ds=" << m_ds.ascii() << endl);
|
||||
nodep->v3error("Syntax error: Not expecting " << nodep->type() << " under a "
|
||||
<< nodep->backp()->type()
|
||||
<< " in dotted expression");
|
||||
@ -2312,12 +2313,12 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
void importImplementsClass(AstClass* implementsClassp, VSymEnt* interfaceSymp,
|
||||
AstClass* baseClassp) {
|
||||
// Also used for standard 'extends' from a base class
|
||||
UINFO(8,
|
||||
"importImplementsClass to " << implementsClassp << " from " << baseClassp << endl);
|
||||
UINFO(8, indent() << "importImplementsClass to " << implementsClassp << " from "
|
||||
<< baseClassp << endl);
|
||||
for (VSymEnt::const_iterator it = interfaceSymp->begin(); it != interfaceSymp->end();
|
||||
++it) {
|
||||
if (AstNode* interfaceSubp = it->second->nodep()) {
|
||||
UINFO(8, " SymFunc " << interfaceSubp << endl);
|
||||
UINFO(8, indent() << " SymFunc " << interfaceSubp << endl);
|
||||
if (VN_IS(interfaceSubp, NodeFTask)) {
|
||||
const VSymEnt* const foundp = m_curSymp->findIdFlat(interfaceSubp->name());
|
||||
const AstNodeFTask* const interfaceFuncp = VN_CAST(interfaceSubp, NodeFTask);
|
||||
@ -2376,6 +2377,16 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
if (nodep && nodep->isParam()) nodep->usedParam(true);
|
||||
}
|
||||
|
||||
#define LINKDOT_VISIT_START() \
|
||||
VL_RESTORER(m_indent); \
|
||||
++m_indent;
|
||||
|
||||
string indent() const {
|
||||
string result = "";
|
||||
result.insert(0, m_indent, ':');
|
||||
return result + " ";
|
||||
}
|
||||
|
||||
// VISITs
|
||||
void visit(AstNetlist* nodep) override {
|
||||
// Recurse..., backward as must do packages before using packages
|
||||
@ -2385,8 +2396,9 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
void visit(AstConstPool*) override {}
|
||||
void visit(AstNodeModule* nodep) override {
|
||||
if (nodep->dead()) return;
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(8, indent() << "visit " << nodep << endl);
|
||||
checkNoDot(nodep);
|
||||
UINFO(8, " " << nodep << endl);
|
||||
m_ds.init(m_curSymp);
|
||||
m_ds.m_dotSymp = m_curSymp = m_modSymp
|
||||
= m_statep->getNodeSym(nodep); // Until overridden by a SCOPE
|
||||
@ -2398,7 +2410,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
m_ds.m_dotSymp = m_curSymp = m_modSymp = nullptr;
|
||||
}
|
||||
void visit(AstScope* nodep) override {
|
||||
UINFO(8, " " << nodep << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(8, indent() << "visit " << nodep << endl);
|
||||
VL_RESTORER(m_modSymp);
|
||||
VL_RESTORER(m_curSymp);
|
||||
{
|
||||
@ -2409,6 +2422,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
}
|
||||
void visit(AstCellInline* nodep) override {
|
||||
LINKDOT_VISIT_START();
|
||||
checkNoDot(nodep);
|
||||
if (m_statep->forScopeCreation() && !v3Global.opt.vpi()) {
|
||||
nodep->unlinkFrBack();
|
||||
@ -2417,6 +2431,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
void visit(AstCell* nodep) override {
|
||||
// Cell: Recurse inside or cleanup not founds
|
||||
LINKDOT_VISIT_START();
|
||||
checkNoDot(nodep);
|
||||
VL_RESTORER(m_usedPins);
|
||||
m_usedPins.clear();
|
||||
@ -2436,7 +2451,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
// instantiator's symbols
|
||||
else {
|
||||
m_pinSymp = m_statep->getNodeSym(nodep->modp());
|
||||
UINFO(4, "(Backto) Link Cell: " << nodep << endl);
|
||||
UINFO(4, indent() << "(Backto) Link Cell: " << nodep << endl);
|
||||
// if (debug()) nodep->dumpTree("- linkcell: ");
|
||||
// if (debug()) nodep->modp()->dumpTree("- linkcemd: ");
|
||||
iterateChildren(nodep);
|
||||
@ -2447,6 +2462,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
void visit(AstClassRefDType* nodep) override {
|
||||
// Cell: Recurse inside or cleanup not founds
|
||||
LINKDOT_VISIT_START();
|
||||
checkNoDot(nodep);
|
||||
VL_RESTORER(m_usedPins);
|
||||
m_usedPins.clear();
|
||||
@ -2457,7 +2473,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
{
|
||||
// ClassRef's have pins, so track
|
||||
m_pinSymp = m_statep->getNodeSym(nodep->classp());
|
||||
UINFO(4, "(Backto) Link ClassRefDType: " << nodep << endl);
|
||||
UINFO(4, indent() << "(Backto) Link ClassRefDType: " << nodep << endl);
|
||||
// if (debug()) nodep->dumpTree("- linkcell: ");
|
||||
// if (debug()) nodep->modp()->dumpTree("- linkcemd: ");
|
||||
iterateChildren(nodep);
|
||||
@ -2465,6 +2481,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
void visit(AstPin* nodep) override {
|
||||
// Pin: Link to submodule's port
|
||||
LINKDOT_VISIT_START();
|
||||
checkNoDot(nodep);
|
||||
iterateChildren(nodep);
|
||||
if (!nodep->modVarp()) {
|
||||
@ -2532,7 +2549,9 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
// Dot(Dot(ClassOrPackageRef,ClassOrPackageRef), ParseRef(text))
|
||||
// Dot(Dot(Dot(ParseRef(text), ...
|
||||
if (nodep->user3SetOnce()) return;
|
||||
UINFO(8, " " << nodep << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(8, indent() << "visit " << nodep << endl);
|
||||
UINFO(8, indent() << m_ds.ascii() << endl);
|
||||
const DotStates lastStates = m_ds;
|
||||
const bool start = (m_ds.m_dotPos == DP_NONE); // Save, as m_dotp will be changed
|
||||
VL_RESTORER(m_fromSymp);
|
||||
@ -2551,7 +2570,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
m_ds.m_dotErr = true;
|
||||
} else {
|
||||
m_ds.m_dotSymp = classSymp;
|
||||
UINFO(8, " this. " << m_ds.ascii() << endl);
|
||||
UINFO(8, indent() << "this. " << m_ds.ascii() << endl);
|
||||
}
|
||||
} else if (VN_IS(nodep->lhsp(), ParseRef) && nodep->lhsp()->name() == "super") {
|
||||
const VSymEnt* classSymp = getThisClassSymp();
|
||||
@ -2573,19 +2592,22 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
UASSERT_OBJ(baseClassp, nodep, "Bad superclass");
|
||||
m_ds.m_dotSymp = m_statep->getNodeSym(baseClassp);
|
||||
m_ds.m_super = true;
|
||||
UINFO(8, " super. " << m_ds.ascii() << endl);
|
||||
UINFO(8, indent() << "super. " << m_ds.ascii() << endl);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (VN_IS(nodep->lhsp(), ClassOrPackageRef)) {
|
||||
} else if (VN_IS(nodep->lhsp(), ClassOrPackageRef)
|
||||
|| (VN_IS(nodep->lhsp(), Dot) && VN_AS(nodep->lhsp(), Dot)->colon())) {
|
||||
// m_ds.m_dotText communicates the cell prefix between stages
|
||||
// if (!start) { nodep->lhsp()->v3error("Package reference may not be embedded in
|
||||
// dotted reference"); m_ds.m_dotErr=true; }
|
||||
m_ds.m_dotPos = DP_PACKAGE;
|
||||
UINFO(8, indent() << "iter.lhs " << m_ds.ascii() << " " << nodep << endl);
|
||||
iterateAndNextNull(nodep->lhsp());
|
||||
UINFO(8, indent() << "iter.ldone " << m_ds.ascii() << " " << nodep << endl);
|
||||
} else {
|
||||
m_ds.m_dotPos = DP_FIRST;
|
||||
UINFO(8, indent() << "iter.lhs " << m_ds.ascii() << " " << nodep << endl);
|
||||
iterateAndNextNull(nodep->lhsp());
|
||||
UINFO(8, indent() << "iter.ldone " << m_ds.ascii() << " " << nodep << endl);
|
||||
// if (debug() >= 9) nodep->dumpTree("- dot-lho: ");
|
||||
}
|
||||
if (m_statep->forPrimary() && isParamedClassRef(nodep->lhsp())) {
|
||||
@ -2601,7 +2623,9 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
// Top 'final' dot RHS is final RHS, else it's a
|
||||
// DOT(DOT(x,*here*),real-rhs) which we consider a RHS
|
||||
if (start && m_ds.m_dotPos == DP_SCOPE) m_ds.m_dotPos = DP_FINAL;
|
||||
UINFO(8, indent() << "iter.rhs " << m_ds.ascii() << " " << nodep << endl);
|
||||
iterateAndNextNull(nodep->rhsp());
|
||||
UINFO(8, indent() << "iter.rdone " << m_ds.ascii() << " " << nodep << endl);
|
||||
// if (debug() >= 9) nodep->dumpTree("- dot-rho: ");
|
||||
}
|
||||
if (!m_ds.m_unresolvedClass) {
|
||||
@ -2634,15 +2658,19 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
m_ds.m_dotp = lastStates.m_dotp;
|
||||
m_ds.m_unresolvedClass |= unresolvedClass;
|
||||
}
|
||||
UINFO(8, indent() << "done " << m_ds.ascii() << " " << nodep << endl);
|
||||
}
|
||||
void visit(AstSenItem* nodep) override {
|
||||
LINKDOT_VISIT_START();
|
||||
VL_RESTORER(m_inSens);
|
||||
m_inSens = true;
|
||||
iterateChildren(nodep);
|
||||
}
|
||||
void visit(AstParseRef* nodep) override {
|
||||
if (nodep->user3SetOnce()) return;
|
||||
UINFO(9, " linkPARSEREF " << m_ds.ascii() << " n=" << nodep << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(9, indent() << "visit " << nodep << endl);
|
||||
UINFO(9, indent() << m_ds.ascii() << endl);
|
||||
if (m_ds.m_unresolvedClass) return;
|
||||
// m_curSymp is symbol table of outer expression
|
||||
// m_ds.m_dotSymp is symbol table relative to "."'s above now
|
||||
@ -2762,7 +2790,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
VL_DO_DANGLING(pushDeletep(nodep), nodep);
|
||||
return;
|
||||
}
|
||||
UINFO(9, " randomize-with fromSym " << foundp->nodep() << endl);
|
||||
UINFO(9, indent() << "randomize-with fromSym " << foundp->nodep() << endl);
|
||||
AstLambdaArgRef* const lambdaRefp
|
||||
= new AstLambdaArgRef{nodep->fileline(), "item", false};
|
||||
nodep->replaceWith(new AstMemberSel{nodep->fileline(), lambdaRefp,
|
||||
@ -2780,8 +2808,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
foundp = m_ds.m_dotSymp->findIdFlat(nodep->name());
|
||||
}
|
||||
if (foundp) {
|
||||
UINFO(9, " found=se" << cvtToHex(foundp) << " exp=" << expectWhat
|
||||
<< " n=" << foundp->nodep() << endl);
|
||||
UINFO(9, indent() << "found=se" << cvtToHex(foundp) << " exp=" << expectWhat
|
||||
<< " n=" << foundp->nodep() << endl);
|
||||
}
|
||||
// What fell out?
|
||||
bool ok = false;
|
||||
@ -2817,7 +2845,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
m_ds.m_dotText = VString::dot(m_ds.m_dotText, ".", nodep->name());
|
||||
m_ds.m_dotSymp = foundp;
|
||||
m_ds.m_dotPos = DP_SCOPE;
|
||||
UINFO(9, " cell -> iface varref " << foundp->nodep() << endl);
|
||||
UINFO(9, indent() << " cell -> iface varref " << foundp->nodep() << endl);
|
||||
AstNode* const newp
|
||||
= new AstVarRef{nodep->fileline(), ifaceRefVarp, VAccess::READ};
|
||||
nodep->replaceWith(newp);
|
||||
@ -2844,7 +2872,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
if (ifacerefp && varp->isIfaceRef()) {
|
||||
UASSERT_OBJ(ifacerefp->ifaceViaCellp(), ifacerefp, "Unlinked interface");
|
||||
// Really this is a scope reference into an interface
|
||||
UINFO(9, "varref-ifaceref " << m_ds.m_dotText << " " << nodep << endl);
|
||||
UINFO(9, indent()
|
||||
<< "varref-ifaceref " << m_ds.m_dotText << " " << nodep << endl);
|
||||
m_ds.m_dotText = VString::dot(m_ds.m_dotText, ".", nodep->name());
|
||||
m_ds.m_dotSymp = m_statep->getNodeSym(ifacerefp->ifaceViaCellp());
|
||||
m_ds.m_dotPos = DP_SCOPE;
|
||||
@ -2896,7 +2925,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
refp->classOrPackagep(foundp->classOrPackagep());
|
||||
newp = refp;
|
||||
}
|
||||
UINFO(9, " new " << newp << endl);
|
||||
UINFO(9, indent() << "new " << newp << endl);
|
||||
nodep->replaceWith(newp);
|
||||
VL_DO_DANGLING(pushDeletep(nodep), nodep);
|
||||
m_ds.m_dotPos = DP_MEMBER;
|
||||
@ -2905,9 +2934,11 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
} else if (const AstModport* const modportp = VN_CAST(foundp->nodep(), Modport)) {
|
||||
// A scope reference into an interface's modport (not
|
||||
// necessarily at a pin connection)
|
||||
UINFO(9, "cell-ref-to-modport " << m_ds.m_dotText << " " << nodep << endl);
|
||||
UINFO(9, "unlinked " << m_ds.m_unlinkedScopep << endl);
|
||||
UINFO(9, "dotSymp " << m_ds.m_dotSymp << " " << m_ds.m_dotSymp->nodep() << endl);
|
||||
UINFO(9, indent() << "cell-ref-to-modport " << m_ds.m_dotText << " " << nodep
|
||||
<< endl);
|
||||
UINFO(9, indent() << "unlinked " << m_ds.m_unlinkedScopep << endl);
|
||||
UINFO(9, indent() << "dotSymp " << m_ds.m_dotSymp << " " << m_ds.m_dotSymp->nodep()
|
||||
<< endl);
|
||||
// Iface was the previously dotted component
|
||||
if (!m_ds.m_dotSymp || !VN_IS(m_ds.m_dotSymp->nodep(), Cell)
|
||||
|| !VN_AS(m_ds.m_dotSymp->nodep(), Cell)->modp()
|
||||
@ -2934,7 +2965,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
m_ds.m_dotText = VString::dot(m_ds.m_dotText, ".", nodep->name());
|
||||
m_ds.m_dotSymp = foundp;
|
||||
m_ds.m_dotPos = DP_SCOPE;
|
||||
UINFO(9, " modport -> iface varref " << foundp->nodep() << endl);
|
||||
UINFO(9, indent() << "modport -> iface varref " << foundp->nodep() << endl);
|
||||
// We lose the modport name here, so we cannot detect mismatched modports.
|
||||
AstNodeExpr* newp
|
||||
= new AstVarRef{nodep->fileline(), ifaceRefVarp, VAccess::READ};
|
||||
@ -2942,7 +2973,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
if (cellarrayrefp) {
|
||||
// iface[vec].modport became CellArrayRef(iface, lsb)
|
||||
// Convert back to SelBit(iface, lsb)
|
||||
UINFO(9, " Array modport to SelBit " << cellarrayrefp << endl);
|
||||
UINFO(9, indent() << "Array modport to SelBit " << cellarrayrefp << endl);
|
||||
newp = new AstSelBit{cellarrayrefp->fileline(), newp,
|
||||
cellarrayrefp->selp()->unlinkFrBack()};
|
||||
newp->user3(true); // Don't process again
|
||||
@ -3022,7 +3053,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
<< " as a " << foundp->nodep()->typeName()
|
||||
<< " but expected a " << expectWhat);
|
||||
} else if (m_ds.m_dotText == "") {
|
||||
UINFO(7, " ErrParseRef curSymp=se"
|
||||
UINFO(1, " ErrParseRef curSymp=se"
|
||||
<< cvtToHex(m_curSymp) << " ds=" << m_ds.ascii() << endl);
|
||||
const string suggest = m_statep->suggestSymFallback(
|
||||
m_ds.m_dotSymp, nodep->name(), VNodeMatcher{});
|
||||
@ -3060,6 +3091,9 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
void visit(AstClassOrPackageRef* nodep) override {
|
||||
// Class: Recurse inside or cleanup not founds
|
||||
// checkNoDot not appropriate, can be under a dot
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(8, indent() << "visit " << nodep << endl);
|
||||
UINFO(9, indent() << m_ds.ascii() << endl);
|
||||
VL_RESTORER(m_usedPins);
|
||||
m_usedPins.clear();
|
||||
UASSERT_OBJ(m_statep->forPrimary() || VN_IS(nodep->classOrPackageNodep(), ParamTypeDType)
|
||||
@ -3082,7 +3116,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
if (refClassp && !m_statep->forPrimary()) classExtendImport(refClassp);
|
||||
|
||||
m_ds.init(m_curSymp);
|
||||
UINFO(4, "(Backto) Link ClassOrPackageRef: " << nodep << endl);
|
||||
UINFO(4, indent() << "(Backto) Link ClassOrPackageRef: " << nodep << endl);
|
||||
iterateChildren(nodep);
|
||||
|
||||
if (nodep->name() == "local::") {
|
||||
@ -3105,8 +3139,9 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
void visit(AstConstraintRef* nodep) override {
|
||||
if (nodep->user3SetOnce()) return;
|
||||
UINFO(8, " " << nodep << endl);
|
||||
UINFO(8, " " << m_ds.ascii() << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(8, indent() << "visit " << nodep << endl);
|
||||
UINFO(8, indent() << m_ds.ascii() << endl);
|
||||
// No children defined
|
||||
}
|
||||
void visit(AstVarRef* nodep) override {
|
||||
@ -3114,9 +3149,11 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
// ParseRefs are used the first pass (forPrimary) so we shouldn't get can't find
|
||||
// errors here now that we have a VarRef.
|
||||
// No checkNoDot; created and iterated from a parseRef
|
||||
LINKDOT_VISIT_START();
|
||||
iterateChildren(nodep);
|
||||
if (!nodep->varp()) {
|
||||
UINFO(9, " linkVarRef se" << cvtToHex(m_curSymp) << " n=" << nodep << endl);
|
||||
UINFO(9,
|
||||
indent() << "linkVarRef se" << cvtToHex(m_curSymp) << " n=" << nodep << endl);
|
||||
UASSERT_OBJ(m_curSymp, nodep, "nullptr lookup symbol table");
|
||||
VSymEnt* const foundp = m_curSymp->findIdFallback(nodep->name());
|
||||
if (AstVar* const varp
|
||||
@ -3137,7 +3174,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
// We always link even if varp() is set, because the module we choose may change
|
||||
// due to creating new modules, flattening, etc.
|
||||
if (nodep->user3SetOnce()) return;
|
||||
UINFO(8, " " << nodep << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(8, indent() << "visit " << nodep << endl);
|
||||
// No checkNoDot; created and iterated from a parseRef
|
||||
if (!m_modSymp) {
|
||||
// Module that is not in hierarchy. We'll be dead code eliminating it later.
|
||||
@ -3172,7 +3210,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
= foundp ? foundToVarp(foundp, nodep, nodep->access()) : nullptr;
|
||||
nodep->varp(varp);
|
||||
updateVarUse(nodep->varp());
|
||||
UINFO(7, " Resolved " << nodep << endl); // Also prints varp
|
||||
UINFO(7, indent() << "Resolved " << nodep << endl); // Also prints varp
|
||||
if (!nodep->varp()) {
|
||||
nodep->v3error("Can't find definition of "
|
||||
<< AstNode::prettyNameQ(baddot) << " in dotted signal: '"
|
||||
@ -3205,8 +3243,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
okSymp->cellErrorScopes(nodep);
|
||||
} else {
|
||||
while (vscp->user2p()) { // If V3Inline aliased it, pick up the new signal
|
||||
UINFO(7, " Resolved pre-alias " << vscp
|
||||
<< endl); // Also prints taskp
|
||||
UINFO(7, indent() << "Resolved pre-alias " << vscp
|
||||
<< endl); // Also prints taskp
|
||||
vscp = VN_AS(vscp->user2p(), VarScope);
|
||||
}
|
||||
// Convert the VarXRef to a VarRef, so we don't need
|
||||
@ -3214,17 +3252,18 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
nodep->varp(vscp->varp());
|
||||
nodep->varScopep(vscp);
|
||||
updateVarUse(nodep->varp());
|
||||
UINFO(7, " Resolved " << nodep << endl); // Also prints taskp
|
||||
UINFO(7, indent() << "Resolved " << nodep << endl); // Also prints taskp
|
||||
AstVarRef* const newvscp
|
||||
= new AstVarRef{nodep->fileline(), vscp, nodep->access()};
|
||||
nodep->replaceWith(newvscp);
|
||||
VL_DO_DANGLING(nodep->deleteTree(), nodep);
|
||||
UINFO(9, " new " << newvscp << endl); // Also prints taskp
|
||||
UINFO(9, indent() << "new " << newvscp << endl); // Also prints taskp
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
void visit(AstEnumDType* nodep) override {
|
||||
LINKDOT_VISIT_START();
|
||||
iterateChildren(nodep);
|
||||
AstRefDType* const refdtypep = VN_CAST(nodep->subDTypep(), RefDType);
|
||||
if (refdtypep && (nodep == refdtypep->subDTypep())) {
|
||||
@ -3233,10 +3272,12 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
void visit(AstEnumItemRef* nodep) override {
|
||||
// EnumItemRef may be under a dot. Should already be resolved.
|
||||
LINKDOT_VISIT_START();
|
||||
iterateChildren(nodep);
|
||||
}
|
||||
void visit(AstMethodCall* nodep) override {
|
||||
// Created here so should already be resolved.
|
||||
LINKDOT_VISIT_START();
|
||||
VL_RESTORER(m_ds);
|
||||
VL_RESTORER(m_fromSymp);
|
||||
VL_RESTORER(m_randMethodCallp);
|
||||
@ -3288,6 +3329,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
}
|
||||
void visit(AstVar* nodep) override {
|
||||
LINKDOT_VISIT_START();
|
||||
checkNoDot(nodep);
|
||||
iterateChildren(nodep);
|
||||
if (m_statep->forPrimary() && nodep->isIO() && !m_ftaskp && !nodep->user4()) {
|
||||
@ -3297,8 +3339,9 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
void visit(AstNodeFTaskRef* nodep) override {
|
||||
if (nodep->user3SetOnce()) return;
|
||||
UINFO(8, " " << nodep << endl);
|
||||
UINFO(8, " " << m_ds.ascii() << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(8, indent() << "visit " << nodep << endl);
|
||||
UINFO(8, indent() << m_ds.ascii() << endl);
|
||||
if (m_ds.m_dotPos != DP_MEMBER || nodep->name() != "randomize") {
|
||||
// Visit arguments at the beginning.
|
||||
// They may be visitted even if the current node can't be linked now.
|
||||
@ -3370,7 +3413,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
// References into packages don't care about cell hierarchy.
|
||||
} else if (!m_modSymp) {
|
||||
// Module that is not in hierarchy. We'll be dead code eliminating it later.
|
||||
UINFO(9, "Dead module for " << nodep << endl);
|
||||
UINFO(9, indent() << "Dead module for " << nodep << endl);
|
||||
nodep->taskp(nullptr);
|
||||
} else if (nodep->dotted() == "" && nodep->taskp()) {
|
||||
// Earlier should have setup the links
|
||||
@ -3390,7 +3433,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
if (nodep->classOrPackagep()) { // Look only in specified package
|
||||
dotSymp = m_statep->getNodeSym(nodep->classOrPackagep());
|
||||
UINFO(8, " Override classOrPackage " << dotSymp << endl);
|
||||
UINFO(8, indent() << "Override classOrPackage " << dotSymp << endl);
|
||||
} else {
|
||||
if (nodep->inlinedDots() != "") { // Correct for current scope
|
||||
// Dotted lookup is always relative to module, as maybe
|
||||
@ -3398,7 +3441,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
// to ignore (t_math_divw)
|
||||
dotSymp = m_modSymp;
|
||||
const string inl = AstNode::dedotName(nodep->inlinedDots());
|
||||
UINFO(8, " Inlined " << inl << endl);
|
||||
UINFO(8, indent() << "Inlined " << inl << endl);
|
||||
dotSymp = m_statep->findDotted(nodep->fileline(), dotSymp, inl, baddot, okSymp,
|
||||
true);
|
||||
if (!dotSymp) {
|
||||
@ -3414,7 +3457,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
if (m_fromSymp) {
|
||||
VSymEnt* const foundp = m_fromSymp->findIdFlat(nodep->name());
|
||||
if (foundp && m_inWith) {
|
||||
UINFO(9, " randomize-with fromSym " << foundp->nodep() << endl);
|
||||
UINFO(9, indent() << "randomize-with fromSym " << foundp->nodep() << endl);
|
||||
AstNodeExpr* argsp = nullptr;
|
||||
if (nodep->pinsp()) {
|
||||
iterateAndNextNull(nodep->pinsp());
|
||||
@ -3449,23 +3492,23 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
nodep->taskp(taskp);
|
||||
nodep->classOrPackagep(foundp->classOrPackagep());
|
||||
UINFO(7, " Resolved " << nodep << endl); // Also prints taskp
|
||||
UINFO(7, indent() << "Resolved " << nodep << endl); // Also prints taskp
|
||||
} else if (m_insideClassExtParam) {
|
||||
// The reference may point to a method declared in a super class, which is proved
|
||||
// by a parameter. In such a case, it can't be linked at the first stage.
|
||||
return;
|
||||
} else {
|
||||
// Note ParseRef has similar error handling/message output
|
||||
UINFO(7, " ErrFtask curSymp=se" << cvtToHex(m_curSymp) << " dotSymp=se"
|
||||
<< cvtToHex(dotSymp) << endl);
|
||||
UINFO(7, indent() << " ErrFtask curSymp=se" << cvtToHex(m_curSymp)
|
||||
<< " dotSymp=se" << cvtToHex(dotSymp) << endl);
|
||||
if (foundp) {
|
||||
if (VN_IS(foundp->nodep(), Var) && m_ds.m_dotText == "" && m_ftaskp
|
||||
&& m_ftaskp->name() == foundp->nodep()->name()) {
|
||||
// This is a recursive reference to the function itself, not to the var
|
||||
nodep->taskp(m_ftaskp);
|
||||
nodep->classOrPackagep(foundp->classOrPackagep());
|
||||
UINFO(7, " Resolved recursive " << nodep
|
||||
<< endl); // Also prints taskp
|
||||
UINFO(7, indent() << "Resolved recursive " << nodep
|
||||
<< endl); // Also prints taskp
|
||||
} else {
|
||||
nodep->v3error("Found definition of '"
|
||||
<< m_ds.m_dotText << (m_ds.m_dotText == "" ? "" : ".")
|
||||
@ -3541,6 +3584,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
void visit(AstSelBit* nodep) override {
|
||||
if (nodep->user3SetOnce()) return;
|
||||
LINKDOT_VISIT_START();
|
||||
iterateAndNextNull(nodep->fromp());
|
||||
if (m_ds.m_unresolvedClass) {
|
||||
UASSERT_OBJ(m_ds.m_dotPos != DP_SCOPE && m_ds.m_dotPos != DP_FIRST, nodep,
|
||||
@ -3550,7 +3594,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
if (m_ds.m_dotPos == DP_SCOPE
|
||||
|| m_ds.m_dotPos
|
||||
== DP_FIRST) { // Already under dot, so this is {modulepart} DOT {modulepart}
|
||||
UINFO(9, " deferring until after a V3Param pass: " << nodep << endl);
|
||||
UINFO(9, indent() << "deferring until after a V3Param pass: " << nodep << endl);
|
||||
m_ds.m_dotText += "__BRA__??__KET__";
|
||||
m_ds.m_unresolvedCell = true;
|
||||
// And pass up m_ds.m_dotText
|
||||
@ -3576,6 +3620,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
void visit(AstNodePreSel* nodep) override {
|
||||
// Excludes simple AstSelBit, see above
|
||||
if (nodep->user3SetOnce()) return;
|
||||
LINKDOT_VISIT_START();
|
||||
if (m_ds.m_dotPos == DP_SCOPE
|
||||
|| m_ds.m_dotPos
|
||||
== DP_FIRST) { // Already under dot, so this is {modulepart} DOT {modulepart}
|
||||
@ -3599,7 +3644,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
AstNode* const basefromp = AstArraySel::baseFromp(nodep, false);
|
||||
if (VN_IS(basefromp, Replicate)) {
|
||||
// From {...}[...] syntax in IEEE 2017
|
||||
if (basefromp) UINFO(1, " Related node: " << basefromp << endl);
|
||||
if (basefromp) UINFO(9, indent() << " Related node: " << basefromp << endl);
|
||||
} else {
|
||||
nodep->attrp(new AstAttrOf{nodep->fileline(), VAttrType::VAR_BASE,
|
||||
basefromp->cloneTree(false)});
|
||||
@ -3607,24 +3652,27 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
void visit(AstMemberSel* nodep) override {
|
||||
// checkNoDot not appropriate, can be under a dot
|
||||
LINKDOT_VISIT_START();
|
||||
iterateChildren(nodep);
|
||||
}
|
||||
void visit(AstNodeBlock* nodep) override {
|
||||
UINFO(5, " " << nodep << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(5, indent() << "visit " << nodep << endl);
|
||||
checkNoDot(nodep);
|
||||
VL_RESTORER(m_curSymp);
|
||||
{
|
||||
if (nodep->name() != "") {
|
||||
m_ds.m_dotSymp = m_curSymp = m_statep->getNodeSym(nodep);
|
||||
UINFO(5, " cur=se" << cvtToHex(m_curSymp) << endl);
|
||||
UINFO(5, indent() << "cur=se" << cvtToHex(m_curSymp) << endl);
|
||||
}
|
||||
iterateChildren(nodep);
|
||||
}
|
||||
m_ds.m_dotSymp = VL_RESTORER_PREV(m_curSymp);
|
||||
UINFO(5, " cur=se" << cvtToHex(m_curSymp) << endl);
|
||||
UINFO(5, indent() << "cur=se" << cvtToHex(m_curSymp) << endl);
|
||||
}
|
||||
void visit(AstNodeFTask* nodep) override {
|
||||
UINFO(5, " " << nodep << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(5, indent() << "visit " << nodep << endl);
|
||||
checkNoDot(nodep);
|
||||
if (nodep->isExternDef()) {
|
||||
if (const VSymEnt* const foundp
|
||||
@ -3665,7 +3713,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
m_ds.m_dotSymp = VL_RESTORER_PREV(m_curSymp);
|
||||
}
|
||||
void visit(AstNodeForeach* nodep) override {
|
||||
UINFO(5, " " << nodep << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(5, indent() << "visit " << nodep << endl);
|
||||
checkNoDot(nodep);
|
||||
VL_RESTORER(m_curSymp);
|
||||
{
|
||||
@ -3675,7 +3724,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
m_ds.m_dotSymp = VL_RESTORER_PREV(m_curSymp);
|
||||
}
|
||||
void visit(AstWith* nodep) override {
|
||||
UINFO(5, " " << nodep << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(5, indent() << "visit " << nodep << endl);
|
||||
checkNoDot(nodep);
|
||||
VL_RESTORER(m_curSymp);
|
||||
VL_RESTORER(m_inWith);
|
||||
@ -3687,7 +3737,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
m_ds.m_dotSymp = VL_RESTORER_PREV(m_curSymp);
|
||||
}
|
||||
void visit(AstLambdaArgRef* nodep) override {
|
||||
UINFO(5, " " << nodep << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(5, indent() << "visit " << nodep << endl);
|
||||
// No checknodot(nodep), visit(AstScope) will check for LambdaArgRef
|
||||
iterateChildren(nodep);
|
||||
}
|
||||
@ -3697,6 +3748,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
if (nodep->user3SetOnce()) return;
|
||||
// If the class is resolved, there is nothing more to do
|
||||
if (nodep->classOrNullp()) return;
|
||||
LINKDOT_VISIT_START();
|
||||
if (m_statep->forPrimary()) {
|
||||
AstNode* cprp = nodep->classOrPkgsp();
|
||||
VSymEnt* lookSymp = m_curSymp;
|
||||
@ -3774,7 +3826,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
void visit(AstClass* nodep) override {
|
||||
if (nodep->user3SetOnce()) return;
|
||||
UINFO(5, " " << nodep << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(5, indent() << "visit " << nodep << endl);
|
||||
checkNoDot(nodep);
|
||||
VL_RESTORER(m_curSymp);
|
||||
VL_RESTORER(m_modSymp);
|
||||
@ -3856,7 +3909,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
if (AstEnumItem* const aitemp = VN_CAST(itemp, EnumItem)) {
|
||||
AstEnumItemRef* const newp = new AstEnumItemRef{
|
||||
aitemp->fileline(), aitemp, it->second->classOrPackagep()};
|
||||
UINFO(8, "Class import noderef '" << it->first << "' " << newp << endl);
|
||||
UINFO(8, indent() << "Class import noderef '" << it->first << "' " << newp
|
||||
<< endl);
|
||||
nodep->addMembersp(newp);
|
||||
memberMap.insert(nodep, newp);
|
||||
}
|
||||
@ -3868,6 +3922,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
void visit(AstRefDType* nodep) override {
|
||||
// Resolve its reference
|
||||
if (nodep->user3SetOnce()) return;
|
||||
LINKDOT_VISIT_START();
|
||||
if (AstNode* const cpackagep = nodep->classOrPackageOpp()) {
|
||||
if (AstClassOrPackageRef* const cpackagerefp = VN_CAST(cpackagep, ClassOrPackageRef)) {
|
||||
const AstClass* const clsp = VN_CAST(cpackagerefp->classOrPackageNodep(), Class);
|
||||
@ -3952,6 +4007,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
void visit(AstDpiExport* nodep) override {
|
||||
// AstDpiExport: Make sure the function referenced exists, then dump it
|
||||
LINKDOT_VISIT_START();
|
||||
iterateChildren(nodep);
|
||||
checkNoDot(nodep);
|
||||
VSymEnt* const foundp = m_curSymp->findIdFallback(nodep->name());
|
||||
@ -3970,32 +4026,39 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
void visit(AstPackageImport* nodep) override {
|
||||
// No longer needed
|
||||
LINKDOT_VISIT_START();
|
||||
checkNoDot(nodep);
|
||||
VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep);
|
||||
}
|
||||
void visit(AstPackageExport* nodep) override {
|
||||
// No longer needed
|
||||
LINKDOT_VISIT_START();
|
||||
checkNoDot(nodep);
|
||||
VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep);
|
||||
}
|
||||
void visit(AstPackageExportStarStar* nodep) override {
|
||||
// No longer needed
|
||||
LINKDOT_VISIT_START();
|
||||
checkNoDot(nodep);
|
||||
VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep);
|
||||
}
|
||||
void visit(AstCellRef* nodep) override {
|
||||
UINFO(5, " AstCellRef: " << nodep << " " << m_ds.ascii() << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(5, indent() << "visit " << nodep << endl);
|
||||
iterateChildren(nodep);
|
||||
}
|
||||
void visit(AstCellArrayRef* nodep) override {
|
||||
UINFO(5, " AstCellArrayRef: " << nodep << " " << m_ds.ascii() << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(5, indent() << "visit " << nodep << endl);
|
||||
// Expression already iterated
|
||||
}
|
||||
void visit(AstUnlinkedRef* nodep) override {
|
||||
UINFO(5, " AstCellArrayRef: " << nodep << " " << m_ds.ascii() << endl);
|
||||
LINKDOT_VISIT_START();
|
||||
UINFO(5, indent() << "visit " << nodep << endl);
|
||||
// No need to iterate, if we have a UnlinkedVarXRef, we're already done
|
||||
}
|
||||
void visit(AstStmtExpr* nodep) override {
|
||||
LINKDOT_VISIT_START();
|
||||
checkNoDot(nodep);
|
||||
// Check if nodep represents a super.new call;
|
||||
if (VN_IS(nodep->exprp(), New)) {
|
||||
@ -4010,6 +4073,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
}
|
||||
|
||||
void visit(AstIfaceRefDType* nodep) override {
|
||||
LINKDOT_VISIT_START();
|
||||
if (nodep->paramsp()) {
|
||||
// If there is no parameters, there is no need to visit this node.
|
||||
AstIface* const ifacep = nodep->ifacep();
|
||||
@ -4027,6 +4091,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
|
||||
void visit(AstAttrOf* nodep) override { iterateChildren(nodep); }
|
||||
|
||||
void visit(AstNode* nodep) override {
|
||||
LINKDOT_VISIT_START();
|
||||
checkNoDot(nodep);
|
||||
iterateChildren(nodep);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user