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

Internals: Add proper delegation to dump methods (#2555)

This commit is contained in:
Piotr Binkowski 2020-09-17 03:52:24 +02:00 committed by GitHub
parent e48a859b86
commit 57a53c014d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/V3Ast.h
View File

@ -1907,6 +1907,7 @@ public:
: AstNode{t, fl} {} : AstNode{t, fl} {}
ASTNODE_BASE_FUNCS(NodeMath) ASTNODE_BASE_FUNCS(NodeMath)
// METHODS // METHODS
virtual void dump(std::ostream& str) const override;
virtual bool hasDType() const override { return true; } virtual bool hasDType() const override { return true; }
virtual string emitVerilog() = 0; /// Format string for verilog writing; see V3EmitV virtual string emitVerilog() = 0; /// Format string for verilog writing; see V3EmitV
// For documentation on emitC format see EmitCStmts::emitOpName // For documentation on emitC format see EmitCStmts::emitOpName
@ -1929,6 +1930,7 @@ public:
// See checkTreeIter also that asserts no children // See checkTreeIter also that asserts no children
// cppcheck-suppress functionConst // cppcheck-suppress functionConst
void iterateChildren(AstNVisitor& v) {} void iterateChildren(AstNVisitor& v) {}
virtual void dump(std::ostream& str) const override;
}; };
class AstNodeUniop : public AstNodeMath { class AstNodeUniop : public AstNodeMath {
@ -1943,6 +1945,7 @@ public:
AstNode* lhsp() const { return op1p(); } AstNode* lhsp() const { return op1p(); }
void lhsp(AstNode* nodep) { return setOp1p(nodep); } void lhsp(AstNode* nodep) { return setOp1p(nodep); }
// METHODS // METHODS
virtual void dump(std::ostream& str) const override;
// Set out to evaluation of a AstConst'ed lhs // Set out to evaluation of a AstConst'ed lhs
virtual void numberOperate(V3Number& out, const V3Number& lhs) = 0; virtual void numberOperate(V3Number& out, const V3Number& lhs) = 0;
virtual bool cleanLhs() const = 0; virtual bool cleanLhs() const = 0;
@ -2005,6 +2008,7 @@ public:
void rhsp(AstNode* nodep) { return setOp2p(nodep); } void rhsp(AstNode* nodep) { return setOp2p(nodep); }
void thsp(AstNode* nodep) { return setOp3p(nodep); } void thsp(AstNode* nodep) { return setOp3p(nodep); }
// METHODS // METHODS
virtual void dump(std::ostream& str) const override;
// Set out to evaluation of a AstConst'ed // Set out to evaluation of a AstConst'ed
virtual void numberOperate(V3Number& out, const V3Number& lhs, const V3Number& rhs, virtual void numberOperate(V3Number& out, const V3Number& lhs, const V3Number& rhs,
const V3Number& ths) const V3Number& ths)
@ -2160,6 +2164,7 @@ public:
} }
ASTNODE_BASE_FUNCS(NodeProcedure) ASTNODE_BASE_FUNCS(NodeProcedure)
// METHODS // METHODS
virtual void dump(std::ostream& str) const override;
AstNode* bodysp() const { return op2p(); } // op2 = Statements to evaluate AstNode* bodysp() const { return op2p(); } // op2 = Statements to evaluate
void addStmtp(AstNode* nodep) { addOp2p(nodep); } void addStmtp(AstNode* nodep) { addOp2p(nodep); }
bool isJustOneBodyStmt() const { return bodysp() && !bodysp()->nextp(); } bool isJustOneBodyStmt() const { return bodysp() && !bodysp()->nextp(); }
@ -2176,8 +2181,11 @@ public:
// METHODS // METHODS
bool isStatement() const { return m_statement; } // Really a statement bool isStatement() const { return m_statement; } // Really a statement
void statement(bool flag) { m_statement = flag; } void statement(bool flag) { m_statement = flag; }
virtual void addNextStmt(AstNode* newp, AstNode* belowp); // Stop statement searchback here virtual void addNextStmt(AstNode* newp,
virtual void addBeforeStmt(AstNode* newp, AstNode* belowp); // Stop statement searchback here AstNode* belowp) override; // Stop statement searchback here
virtual void addBeforeStmt(AstNode* newp,
AstNode* belowp) override; // Stop statement searchback here
virtual void dump(std::ostream& str = std::cout) const override;
}; };
class AstNodeAssign : public AstNodeStmt { class AstNodeAssign : public AstNodeStmt {
@ -2296,6 +2304,7 @@ public:
this->varp(varp); this->varp(varp);
} }
ASTNODE_BASE_FUNCS(NodeVarRef) ASTNODE_BASE_FUNCS(NodeVarRef)
virtual void dump(std::ostream& str) const override;
virtual bool hasDType() const override { return true; } virtual bool hasDType() const override { return true; }
virtual const char* broken() const override; virtual const char* broken() const override;
virtual int instrCount() const override { return widthInstrs(); } virtual int instrCount() const override { return widthInstrs(); }
@ -2880,6 +2889,7 @@ public:
AstNodeRange(AstType t, FileLine* fl) AstNodeRange(AstType t, FileLine* fl)
: AstNode{t, fl} {} : AstNode{t, fl} {}
ASTNODE_BASE_FUNCS(NodeRange) ASTNODE_BASE_FUNCS(NodeRange)
virtual void dump(std::ostream& str) const override;
}; };
//###################################################################### //######################################################################

64
src/V3AstNodes.cpp
View File

@ -87,8 +87,10 @@ const char* AstNodeUOrStructDType::broken() const {
return nullptr; return nullptr;
} }
void AstNodeStmt::dump(std::ostream& str) const { this->AstNode::dump(str); }
void AstNodeCCall::dump(std::ostream& str) const { void AstNodeCCall::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeStmt::dump(str);
if (funcp()) { if (funcp()) {
str << " " << funcp()->name() << " => "; str << " " << funcp()->name() << " => ";
funcp()->dump(str); funcp()->dump(str);
@ -1035,8 +1037,10 @@ void AstNode::dump(std::ostream& str) const {
} }
} }
void AstNodeProcedure::dump(std::ostream& str) const { this->AstNode::dump(str); }
void AstAlways::dump(std::ostream& str) const { void AstAlways::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeProcedure::dump(str);
if (keyword() != VAlwaysKwd::ALWAYS) str << " [" << keyword().ascii() << "]"; if (keyword() != VAlwaysKwd::ALWAYS) str << " [" << keyword().ascii() << "]";
} }
@ -1057,8 +1061,12 @@ string AstBasicDType::prettyDTypeName() const {
} }
return os.str(); return os.str();
} }
void AstNodeMath::dump(std::ostream& str) const { this->AstNode::dump(str); }
void AstNodeUniop::dump(std::ostream& str) const { this->AstNodeMath::dump(str); }
void AstCCast::dump(std::ostream& str) const { void AstCCast::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeUniop::dump(str);
str << " sz" << size(); str << " sz" << size();
} }
void AstCell::dump(std::ostream& str) const { void AstCell::dump(std::ostream& str) const {
@ -1119,15 +1127,15 @@ void AstClassRefDType::dumpSmall(std::ostream& str) const {
str << "class:" << name(); str << "class:" << name();
} }
void AstNodeCoverOrAssert::dump(std::ostream& str) const { void AstNodeCoverOrAssert::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeStmt::dump(str);
if (immediate()) str << " [IMMEDIATE]"; if (immediate()) str << " [IMMEDIATE]";
} }
void AstDisplay::dump(std::ostream& str) const { void AstDisplay::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeStmt::dump(str);
// str<<" "<<displayType().ascii(); // str<<" "<<displayType().ascii();
} }
void AstEnumItemRef::dump(std::ostream& str) const { void AstEnumItemRef::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeMath::dump(str);
str << " -> "; str << " -> ";
if (itemp()) { if (itemp()) {
itemp()->dump(str); itemp()->dump(str);
@ -1167,7 +1175,7 @@ void AstInitArray::dump(std::ostream& str) const {
} }
} }
void AstJumpGo::dump(std::ostream& str) const { void AstJumpGo::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeStmt::dump(str);
str << " -> "; str << " -> ";
if (labelp()) { if (labelp()) {
labelp()->dump(str); labelp()->dump(str);
@ -1176,7 +1184,7 @@ void AstJumpGo::dump(std::ostream& str) const {
} }
} }
void AstJumpLabel::dump(std::ostream& str) const { void AstJumpLabel::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeStmt::dump(str);
str << " -> "; str << " -> ";
if (blockp()) { if (blockp()) {
blockp()->dump(str); blockp()->dump(str);
@ -1185,7 +1193,7 @@ void AstJumpLabel::dump(std::ostream& str) const {
} }
} }
void AstMemberSel::dump(std::ostream& str) const { void AstMemberSel::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeMath::dump(str);
str << " -> "; str << " -> ";
if (varp()) { if (varp()) {
varp()->dump(str); varp()->dump(str);
@ -1194,7 +1202,7 @@ void AstMemberSel::dump(std::ostream& str) const {
} }
} }
void AstMethodCall::dump(std::ostream& str) const { void AstMethodCall::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeStmt::dump(str);
if (isStatement()) str << " [STMT]"; if (isStatement()) str << " [STMT]";
str << " -> "; str << " -> ";
if (taskp()) { if (taskp()) {
@ -1235,27 +1243,30 @@ void AstPin::dump(std::ostream& str) const {
if (svImplicit()) str << " [.SV]"; if (svImplicit()) str << " [.SV]";
} }
void AstPrintTimeScale::dump(std::ostream& str) const { void AstPrintTimeScale::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeStmt::dump(str);
str << " " << timeunit(); str << " " << timeunit();
} }
void AstNodeTermop::dump(std::ostream& str) const { this->AstNodeMath::dump(str); }
void AstTime::dump(std::ostream& str) const { void AstTime::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeTermop::dump(str);
str << " " << timeunit(); str << " " << timeunit();
} }
void AstTimeD::dump(std::ostream& str) const { void AstTimeD::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeTermop::dump(str);
str << " " << timeunit(); str << " " << timeunit();
} }
void AstTimeImport::dump(std::ostream& str) const { void AstTimeImport::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeUniop::dump(str);
str << " " << timeunit(); str << " " << timeunit();
} }
void AstTypedef::dump(std::ostream& str) const { void AstTypedef::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNode::dump(str);
if (attrPublic()) str << " [PUBLIC]"; if (attrPublic()) str << " [PUBLIC]";
} }
void AstNodeRange::dump(std::ostream& str) const { this->AstNode::dump(str); }
void AstRange::dump(std::ostream& str) const { void AstRange::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeRange::dump(str);
if (littleEndian()) str << " [LITTLE]"; if (littleEndian()) str << " [LITTLE]";
} }
void AstRefDType::dump(std::ostream& str) const { void AstRefDType::dump(std::ostream& str) const {
@ -1352,15 +1363,16 @@ void AstPackageImport::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNode::dump(str);
str << " -> " << packagep(); str << " -> " << packagep();
} }
void AstNodeTriop::dump(std::ostream& str) const { this->AstNodeMath::dump(str); }
void AstSel::dump(std::ostream& str) const { void AstSel::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeTriop::dump(str);
if (declRange().ranged()) { if (declRange().ranged()) {
str << " decl" << declRange() << "]"; str << " decl" << declRange() << "]";
if (declElWidth() != 1) str << "/" << declElWidth(); if (declElWidth() != 1) str << "/" << declElWidth();
} }
} }
void AstSliceSel::dump(std::ostream& str) const { void AstSliceSel::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeTriop::dump(str);
if (declRange().ranged()) str << " decl" << declRange(); if (declRange().ranged()) str << " decl" << declRange();
} }
void AstMTaskBody::dump(std::ostream& str) const { void AstMTaskBody::dump(std::ostream& str) const {
@ -1428,8 +1440,9 @@ void AstVarScope::dump(std::ostream& str) const {
str << " ->UNLINKED"; str << " ->UNLINKED";
} }
} }
void AstNodeVarRef::dump(std::ostream& str) const { this->AstNodeMath::dump(str); }
void AstVarXRef::dump(std::ostream& str) const { void AstVarXRef::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeVarRef::dump(str);
if (packagep()) { str << " pkg=" << nodeAddr(packagep()); } if (packagep()) { str << " pkg=" << nodeAddr(packagep()); }
if (access().isWrite()) { if (access().isWrite()) {
str << " [LV] => "; str << " [LV] => ";
@ -1447,7 +1460,7 @@ void AstVarXRef::dump(std::ostream& str) const {
} }
} }
void AstVarRef::dump(std::ostream& str) const { void AstVarRef::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeVarRef::dump(str);
if (packagep()) { str << " pkg=" << nodeAddr(packagep()); } if (packagep()) { str << " pkg=" << nodeAddr(packagep()); }
if (access().isWrite()) { if (access().isWrite()) {
str << " [LV] => "; str << " [LV] => ";
@ -1522,7 +1535,7 @@ void AstActive::dump(std::ostream& str) const {
} }
} }
void AstNodeFTaskRef::dump(std::ostream& str) const { void AstNodeFTaskRef::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeStmt::dump(str);
if (packagep()) { str << " pkg=" << nodeAddr(packagep()); } if (packagep()) { str << " pkg=" << nodeAddr(packagep()); }
str << " -> "; str << " -> ";
if (dotted() != "") { str << ".=" << dotted() << " "; } if (dotted() != "") { str << ".=" << dotted() << " "; }
@ -1554,7 +1567,7 @@ void AstBegin::dump(std::ostream& str) const {
if (implied()) str << " [IMPLIED]"; if (implied()) str << " [IMPLIED]";
} }
void AstCoverDecl::dump(std::ostream& str) const { void AstCoverDecl::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeStmt::dump(str);
if (!page().empty()) str << " page=" << page(); if (!page().empty()) str << " page=" << page();
if (!linescov().empty()) str << " lc=" << linescov(); if (!linescov().empty()) str << " lc=" << linescov();
if (this->dataDeclNullp()) { if (this->dataDeclNullp()) {
@ -1565,7 +1578,7 @@ void AstCoverDecl::dump(std::ostream& str) const {
} }
} }
void AstCoverInc::dump(std::ostream& str) const { void AstCoverInc::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeStmt::dump(str);
str << " -> "; str << " -> ";
if (declp()) { if (declp()) {
declp()->dump(str); declp()->dump(str);
@ -1578,7 +1591,7 @@ void AstFork::dump(std::ostream& str) const {
if (!joinType().join()) str << " [" << joinType() << "]"; if (!joinType().join()) str << " [" << joinType() << "]";
} }
void AstTraceInc::dump(std::ostream& str) const { void AstTraceInc::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeStmt::dump(str);
str << " -> "; str << " -> ";
if (declp()) { if (declp()) {
declp()->dump(str); declp()->dump(str);
@ -1597,10 +1610,11 @@ void AstNodeText::dump(std::ostream& str) const {
str << " \"" << out << "\""; str << " \"" << out << "\"";
} }
void AstVFile::dump(std::ostream& str) const { this->AstNode::dump(str); } void AstNodeFile::dump(std::ostream& str) const { this->AstNode::dump(str); }
void AstVFile::dump(std::ostream& str) const { this->AstNodeFile::dump(str); }
void AstCFile::dump(std::ostream& str) const { void AstCFile::dump(std::ostream& str) const {
this->AstNode::dump(str); this->AstNodeFile::dump(str);
if (source()) str << " [SRC]"; if (source()) str << " [SRC]";
if (slow()) str << " [SLOW]"; if (slow()) str << " [SLOW]";
} }

1
src/V3AstNodes.h
View File

@ -8496,6 +8496,7 @@ public:
m_name = name; m_name = name;
} }
ASTNODE_BASE_FUNCS(NodeFile) ASTNODE_BASE_FUNCS(NodeFile)
virtual void dump(std::ostream& str) const override;
virtual string name() const override { return m_name; } virtual string name() const override { return m_name; }
virtual V3Hash sameHash() const override { return V3Hash(); } virtual V3Hash sameHash() const override { return V3Hash(); }
virtual bool same(const AstNode* samep) const override { return true; } virtual bool same(const AstNode* samep) const override { return true; }