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

Internals: Refactor some member handling. No functional change intended.

This commit is contained in:
Wilson Snyder 2019-12-23 20:48:23 -05:00
parent a0d391d695
commit c8daab3b46
1 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/V3Width.cpp
View File

@ -1740,56 +1740,53 @@ private:
if (!nodep->fromp()->dtypep()) nodep->fromp()->v3fatalSrc("Unlinked data type"); if (!nodep->fromp()->dtypep()) nodep->fromp()->v3fatalSrc("Unlinked data type");
AstNodeDType* fromDtp = nodep->fromp()->dtypep()->skipRefToEnump(); AstNodeDType* fromDtp = nodep->fromp()->dtypep()->skipRefToEnump();
UINFO(9," from dt "<<fromDtp<<endl); UINFO(9," from dt "<<fromDtp<<endl);
AstMemberDType* memberp = NULL; // NULL=error below
if (AstNodeUOrStructDType* adtypep = VN_CAST(fromDtp, NodeUOrStructDType)) { if (AstNodeUOrStructDType* adtypep = VN_CAST(fromDtp, NodeUOrStructDType)) {
// No need to width-resolve the class, as it was done when we did the child // No need to width-resolve the class, as it was done when we did the child
memberp = adtypep->findMember(nodep->name()); AstMemberDType* memberp = adtypep->findMember(nodep->name());
if (!memberp) { if (!memberp) {
nodep->v3error("Member "<<nodep->prettyNameQ()<<" not found in structure"); nodep->v3error("Member " << nodep->prettyNameQ() << " not found in structure");
} } else {
}
else if (VN_IS(fromDtp, EnumDType)
|| VN_IS(fromDtp, AssocArrayDType)
|| VN_IS(fromDtp, QueueDType)
|| VN_IS(fromDtp, BasicDType)) {
// Method call on enum without following parenthesis, e.g. "ENUM.next"
// Convert this into a method call, and let that visitor figure out what to do next
AstNode* newp = new AstMethodCall(nodep->fileline(),
nodep->fromp()->unlinkFrBack(), nodep->name(), NULL);
nodep->replaceWith(newp);
pushDeletep(nodep); VL_DANGLING(nodep);
userIterate(newp, m_vup);
return;
}
else {
nodep->v3error("Member selection of non-struct/union object '"
<<nodep->fromp()->prettyTypeName()
<<"' which is a '"<<nodep->fromp()->dtypep()->prettyTypeName()<<"'");
}
if (memberp) {
if (m_attrp) { // Looking for the base of the attribute if (m_attrp) { // Looking for the base of the attribute
nodep->dtypep(memberp); nodep->dtypep(memberp);
UINFO(9," MEMBERSEL(attr) -> "<<nodep<<endl); UINFO(9, " MEMBERSEL(attr) -> " << nodep << endl);
UINFO(9," dt-> "<<nodep->dtypep()<<endl); UINFO(9, " dt-> " << nodep->dtypep() << endl);
} else { } else {
AstSel* newp = new AstSel(nodep->fileline(), nodep->fromp()->unlinkFrBack(), AstSel* newp = new AstSel(nodep->fileline(), nodep->fromp()->unlinkFrBack(),
memberp->lsb(), memberp->width()); memberp->lsb(), memberp->width());
// Must skip over the member to find the union; as the member may disappear later // Must skip over the member to find the union; as the member may disappear
// later
newp->dtypep(memberp->subDTypep()->skipRefToEnump()); newp->dtypep(memberp->subDTypep()->skipRefToEnump());
newp->didWidth(true); // Don't replace dtype with basic type newp->didWidth(true); // Don't replace dtype with basic type
UINFO(9," MEMBERSEL -> "<<newp<<endl); UINFO(9, " MEMBERSEL -> " << newp << endl);
UINFO(9," dt-> "<<newp->dtypep()<<endl); UINFO(9, " dt-> " << newp->dtypep() << endl);
nodep->replaceWith(newp); nodep->replaceWith(newp);
pushDeletep(nodep); VL_DANGLING(nodep); pushDeletep(nodep); VL_DANGLING(nodep);
// Should be able to treat it as a normal-ish nodesel - maybe. // Should be able to treat it as a normal-ish nodesel - maybe.
// The lhsp() will be strange until this stage; create the number here? // The lhsp() will be strange until this stage; create the number here?
} }
return;
} }
if (!memberp) { // Very bogus, but avoids core dump } else if (VN_IS(fromDtp, EnumDType)
|| VN_IS(fromDtp, AssocArrayDType)
|| VN_IS(fromDtp, QueueDType)
|| VN_IS(fromDtp, BasicDType)) {
// Method call on enum without following parenthesis, e.g. "ENUM.next"
// Convert this into a method call, and let that visitor figure out what to do next
AstNode* newp = new AstMethodCall(nodep->fileline(), nodep->fromp()->unlinkFrBack(),
nodep->name(), NULL);
nodep->replaceWith(newp);
pushDeletep(nodep); VL_DANGLING(nodep);
userIterate(newp, m_vup);
return;
} else {
nodep->v3error("Member selection of non-struct/union object '"
<< nodep->fromp()->prettyTypeName() << "' which is a '"
<< nodep->fromp()->dtypep()->prettyTypeName() << "'");
}
// Error handling
nodep->replaceWith(new AstConst(nodep->fileline(), AstConst::LogicFalse())); nodep->replaceWith(new AstConst(nodep->fileline(), AstConst::LogicFalse()));
pushDeletep(nodep); VL_DANGLING(nodep); pushDeletep(nodep); VL_DANGLING(nodep);
} }
}
virtual void visit(AstCMethodCall* nodep) { virtual void visit(AstCMethodCall* nodep) {
// Never created before V3Width, so no need to redo it // Never created before V3Width, so no need to redo it
@ -2713,7 +2710,7 @@ private:
if (argp) argp = argp->nextp(); if (argp) argp = argp->nextp();
break; break;
} }
case 'p': { // Packed case 'p': { // Pattern
AstNodeDType* dtypep = argp ? argp->dtypep()->skipRefp() : NULL; AstNodeDType* dtypep = argp ? argp->dtypep()->skipRefp() : NULL;
AstBasicDType* basicp = dtypep ? dtypep->basicp() : NULL; AstBasicDType* basicp = dtypep ? dtypep->basicp() : NULL;
if (basicp && basicp->isString()) { if (basicp && basicp->isString()) {