github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-30 12:36:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Internals: Clean some UASSERTs. No functional change.

Browse Source
This commit is contained in:
Wilson Snyder 2018-06-16 18:00:21 -04:00
parent 1d74657bbb
commit 047a08c999
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/V3Ast.h
View File

@ -364,8 +364,8 @@ public:
return names[m_e]; return names[m_e];
}; };
static void selfTest() { static void selfTest() {
UASSERT(0==strcmp(AstBasicDTypeKwd(_ENUM_MAX).ascii()," MAX"),"Enum array mismatch"); UASSERT(0==strcmp(AstBasicDTypeKwd(_ENUM_MAX).ascii()," MAX"), "SelfTest: Enum mismatch");
UASSERT(0==strcmp(AstBasicDTypeKwd(_ENUM_MAX).dpiType()," MAX"),"Enum array mismatch"); UASSERT(0==strcmp(AstBasicDTypeKwd(_ENUM_MAX).dpiType()," MAX"),"SelfTest: Enum mismatch");
} }
inline AstBasicDTypeKwd () : m_e(UNKNOWN) {} inline AstBasicDTypeKwd () : m_e(UNKNOWN) {}
// cppcheck-suppress noExplicitConstructor // cppcheck-suppress noExplicitConstructor

9
src/V3GraphTest.cpp
View File

@ -119,9 +119,12 @@ public:
gp->stronglyConnected(&V3GraphEdge::followAlwaysTrue); gp->stronglyConnected(&V3GraphEdge::followAlwaysTrue);
dump(); dump();
UASSERT(i->color()!=a->color() && a->color() != g2->color() && g2->color() != q->color(), "Separate colors not assigned"); UASSERT(i->color()!=a->color() && a->color() != g2->color() && g2->color() != q->color(),
UASSERT(a->color()==b->color() && a->color()==g1->color(), "Strongly connected nodes not colored together"); "SelfTest: Separate colors not assigned");
UASSERT(g2->color()==g3->color(), "Strongly connected nodes not colored together"); UASSERT(a->color()==b->color() && a->color()==g1->color(),
"SelfTest: Strongly connected nodes not colored together");
UASSERT(g2->color()==g3->color(),
"SelfTest: Strongly connected nodes not colored together");
} }
}; };

8
src/V3Param.cpp
View File

@ -197,12 +197,16 @@ private:
// Find it in the clone structure // Find it in the clone structure
//UINFO(8,"Clone find 0x"<<hex<<(uint32_t)pinp->modVarp()<<endl); //UINFO(8,"Clone find 0x"<<hex<<(uint32_t)pinp->modVarp()<<endl);
CloneMap::iterator cloneiter = clonemapp->find(pinp->modVarp()); CloneMap::iterator cloneiter = clonemapp->find(pinp->modVarp());
UASSERT(cloneiter != clonemapp->end(), "Couldn't find pin in clone list"); if (cloneiter == clonemapp->end()) {
pinp->v3fatalSrc("Couldn't find pin in clone list");
}
pinp->modVarp(cloneiter->second->castVar()); pinp->modVarp(cloneiter->second->castVar());
} }
else if (pinp->modPTypep()) { else if (pinp->modPTypep()) {
CloneMap::iterator cloneiter = clonemapp->find(pinp->modPTypep()); CloneMap::iterator cloneiter = clonemapp->find(pinp->modPTypep());
UASSERT(cloneiter != clonemapp->end(), "Couldn't find pin in clone list"); if (cloneiter == clonemapp->end()) {
pinp->v3fatalSrc("Couldn't find pin in clone list");
}
pinp->modPTypep(cloneiter->second->castParamTypeDType()); pinp->modPTypep(cloneiter->second->castParamTypeDType());
} }
else { else {