Internals: Remove dead needHInlines code

This commit is contained in:
Wilson Snyder 2020-05-16 07:53:27 -04:00
parent 57a937df03
commit 6fd7f45cef
10 changed files with 9 additions and 39 deletions

View File

@ -1145,7 +1145,7 @@ void AstNode::dumpTreeFile(const string& filename, bool append, bool doDump) {
void AstNode::v3errorEndFatal(std::ostringstream& str) const { void AstNode::v3errorEndFatal(std::ostringstream& str) const {
v3errorEnd(str); v3errorEnd(str);
assert(0); assert(0); // LCOV_EXCL_LINE
VL_UNREACHABLE VL_UNREACHABLE
} }

View File

@ -150,11 +150,12 @@ public:
static void prepForTree() { static void prepForTree() {
#ifndef VL_LEAK_CHECKS #ifndef VL_LEAK_CHECKS
s_nodes.clear(); s_nodes.clear();
#endif #else
for (NodeMap::iterator it = s_nodes.begin(); it != s_nodes.end(); ++it) { for (NodeMap::iterator it = s_nodes.begin(); it != s_nodes.end(); ++it) {
it->second &= ~FLAG_IN_TREE; it->second &= ~FLAG_IN_TREE;
it->second &= ~FLAG_LINKABLE; it->second &= ~FLAG_LINKABLE;
} }
#endif
} }
static void doneWithTree() { static void doneWithTree() {
for (int backs = 0; backs < 2; for (int backs = 0; backs < 2;

View File

@ -2913,9 +2913,6 @@ void EmitCImp::emitIntTop(AstNodeModule* modp) {
puts("#include \"verilated_cov.h\"\n"); puts("#include \"verilated_cov.h\"\n");
if (v3Global.opt.savable()) v3error("--coverage and --savable not supported together"); if (v3Global.opt.savable()) v3error("--coverage and --savable not supported together");
} }
if (v3Global.needHInlines()) { // Set by V3EmitCInlines; should have been called before us
puts("#include \"" + topClassName() + "__Inlines.h\"\n");
}
if (v3Global.dpi()) { if (v3Global.dpi()) {
// do this before including our main .h file so that any references to // do this before including our main .h file so that any references to
// types defined in svdpi.h are available // types defined in svdpi.h are available

View File

@ -33,7 +33,6 @@ class EmitCInlines : EmitCBaseVisitor {
// STATE // STATE
// METHODS // METHODS
void emitInt();
// VISITORS // VISITORS
virtual void visit(AstBasicDType* nodep) VL_OVERRIDE { virtual void visit(AstBasicDType* nodep) VL_OVERRIDE {
@ -113,32 +112,9 @@ class EmitCInlines : EmitCBaseVisitor {
virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); }
public: public:
explicit EmitCInlines(AstNetlist* nodep) { explicit EmitCInlines(AstNetlist* nodep) { iterate(nodep); }
iterate(nodep);
if (v3Global.needHInlines()) emitInt();
}
}; };
void EmitCInlines::emitInt() {
string filename = v3Global.opt.makeDir() + "/" + topClassName() + "__Inlines.h";
newCFile(filename, false /*slow*/, false /*source*/);
V3OutCFile hf(filename);
m_ofp = &hf;
ofp()->putsHeader();
ofp()->putsGuard();
puts("\n");
puts("#include \"verilated.h\"\n");
puts("\n//======================\n\n");
// Placeholder - v3Global.needHInlines(true) currently not used
puts("//======================\n\n");
ofp()->putsEndGuard();
}
//###################################################################### //######################################################################
// EmitC class functions // EmitC class functions

View File

@ -298,7 +298,7 @@ inline int debug() { return V3Error::debugDefault(); }
inline void v3errorEnd(std::ostringstream& sstr) { V3Error::v3errorEnd(sstr); } inline void v3errorEnd(std::ostringstream& sstr) { V3Error::v3errorEnd(sstr); }
inline void v3errorEndFatal(std::ostringstream& sstr) { inline void v3errorEndFatal(std::ostringstream& sstr) {
V3Error::v3errorEnd(sstr); V3Error::v3errorEnd(sstr);
assert(0); assert(0); // LCOV_EXCL_LINE
VL_UNREACHABLE VL_UNREACHABLE
} }

View File

@ -271,7 +271,7 @@ std::ostream& operator<<(std::ostream& os, FileLine* fileline);
inline void FileLine::v3errorEndFatal(std::ostringstream& str) { inline void FileLine::v3errorEndFatal(std::ostringstream& str) {
v3errorEnd(str); v3errorEnd(str);
assert(0); assert(0); // LCOV_EXCL_LINE
VL_UNREACHABLE VL_UNREACHABLE
} }

View File

@ -74,7 +74,6 @@ class V3Global {
bool m_assertDTypesResolved; // Tree should have dtypep()'s bool m_assertDTypesResolved; // Tree should have dtypep()'s
bool m_constRemoveXs; // Const needs to strip any Xs bool m_constRemoveXs; // Const needs to strip any Xs
bool m_needC11; // Need C++11 bool m_needC11; // Need C++11
bool m_needHInlines; // Need __Inlines file
bool m_needHeavy; // Need verilated_heavy.h include bool m_needHeavy; // Need verilated_heavy.h include
bool m_needTraceDumper; // Need __Vm_dumperp in symbols bool m_needTraceDumper; // Need __Vm_dumperp in symbols
bool m_dpi; // Need __Dpi include files bool m_dpi; // Need __Dpi include files
@ -92,7 +91,6 @@ public:
, m_assertDTypesResolved(false) , m_assertDTypesResolved(false)
, m_constRemoveXs(false) , m_constRemoveXs(false)
, m_needC11(false) , m_needC11(false)
, m_needHInlines(false)
, m_needHeavy(false) , m_needHeavy(false)
, m_needTraceDumper(false) , m_needTraceDumper(false)
, m_dpi(false) {} , m_dpi(false) {}
@ -125,8 +123,6 @@ public:
} }
bool needC11() const { return m_needC11; } bool needC11() const { return m_needC11; }
void needC11(bool flag) { m_needC11 = flag; } void needC11(bool flag) { m_needC11 = flag; }
bool needHInlines() const { return m_needHInlines; }
void needHInlines(bool flag) { m_needHInlines = flag; }
bool needHeavy() const { return m_needHeavy; } bool needHeavy() const { return m_needHeavy; }
void needHeavy(bool flag) { m_needHeavy = flag; } void needHeavy(bool flag) { m_needHeavy = flag; }
bool needTraceDumper() const { return m_needTraceDumper; } bool needTraceDumper() const { return m_needTraceDumper; }

View File

@ -142,7 +142,7 @@ void V3GraphVertex::v3errorEnd(std::ostringstream& str) const {
} }
void V3GraphVertex::v3errorEndFatal(std::ostringstream& str) const { void V3GraphVertex::v3errorEndFatal(std::ostringstream& str) const {
v3errorEnd(str); v3errorEnd(str);
assert(0); assert(0); // LCOV_EXCL_LINE
VL_UNREACHABLE VL_UNREACHABLE
} }

View File

@ -85,7 +85,7 @@ void V3Number::v3errorEnd(std::ostringstream& str) const {
void V3Number::v3errorEndFatal(std::ostringstream& str) const { void V3Number::v3errorEndFatal(std::ostringstream& str) const {
v3errorEnd(str); v3errorEnd(str);
assert(0); assert(0); // LCOV_EXCL_LINE
VL_UNREACHABLE VL_UNREACHABLE
} }