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

Internals: Move trace check up. No functional change.

This commit is contained in:
Wilson Snyder 2012-07-21 20:33:24 -04:00
parent 8b9b7178a2
commit 8d5e37a413
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/V3LinkDot.cpp
View File

@ -848,16 +848,6 @@ private:
m_modp = NULL; m_modp = NULL;
} }
} }
virtual void visit(AstVar* nodep, AstNUser*) {
// We used modTrace before leveling, and we may now
// want to turn it off now that we know the levelizations
if (v3Global.opt.traceDepth()
&& (m_modp->level()-1) > v3Global.opt.traceDepth()) {
m_modp->modTrace(false);
nodep->trace(false);
}
nodep->iterateChildren(*this);
}
virtual void visit(AstPin* nodep, AstNUser*) { virtual void visit(AstPin* nodep, AstNUser*) {
// Pin: Link to submodule's port // Pin: Link to submodule's port
// Deal with implicit definitions - do before Resolve visitor as may be referenced above declaration // Deal with implicit definitions - do before Resolve visitor as may be referenced above declaration
@ -912,6 +902,8 @@ private:
} }
virtual void visit(AstAssignAlias* nodep, AstNUser*) { virtual void visit(AstAssignAlias* nodep, AstNUser*) {
// tran gates need implicit creation // tran gates need implicit creation
// As VarRefs don't exist in forPrimary, sanity check
if (m_statep->forPrimary()) nodep->v3fatalSrc("Assign aliases unexpected pre-dot");
if (AstVarRef* forrefp = nodep->lhsp()->castVarRef()) { if (AstVarRef* forrefp = nodep->lhsp()->castVarRef()) {
pinImplicitExprRecurse(forrefp); pinImplicitExprRecurse(forrefp);
} }

12
src/V3LinkParse.cpp
View File

@ -67,6 +67,7 @@ private:
bool m_inAlways; // Inside an always bool m_inAlways; // Inside an always
bool m_inGenerate; // Inside a generate bool m_inGenerate; // Inside a generate
AstNodeModule* m_valueModp; // If set, move AstVar->valuep() initial values to this module AstNodeModule* m_valueModp; // If set, move AstVar->valuep() initial values to this module
AstNodeModule* m_modp; // Current module
// METHODS // METHODS
static int debug() { static int debug() {
@ -282,6 +283,14 @@ private:
virtual void visit(AstVar* nodep, AstNUser*) { virtual void visit(AstVar* nodep, AstNUser*) {
cleanFileline(nodep); cleanFileline(nodep);
// We used modTrace before leveling, and we may now
// want to turn it off now that we know the levelizations
if (v3Global.opt.traceDepth()
&& m_modp
&& (m_modp->level()-1) > v3Global.opt.traceDepth()) {
m_modp->modTrace(false);
nodep->trace(false);
}
m_varp = nodep; m_varp = nodep;
nodep->iterateChildren(*this); nodep->iterateChildren(*this);
m_varp = NULL; m_varp = NULL;
@ -420,8 +429,10 @@ private:
cleanFileline(nodep); cleanFileline(nodep);
checkExpected(nodep); // So we detect node types we forgot to list here checkExpected(nodep); // So we detect node types we forgot to list here
// //
m_modp = nodep;
m_valueModp = nodep; m_valueModp = nodep;
nodep->iterateChildren(*this); nodep->iterateChildren(*this);
m_modp = NULL;
m_valueModp = NULL; m_valueModp = NULL;
} }
void visitIterateNoValueMod(AstNode* nodep) { void visitIterateNoValueMod(AstNode* nodep) {
@ -463,6 +474,7 @@ public:
m_exp = AstParseRefExp::PX_NONE; m_exp = AstParseRefExp::PX_NONE;
m_baseTextp = NULL; m_baseTextp = NULL;
m_varp = NULL; m_varp = NULL;
m_modp = NULL;
m_inAlways = false; m_inAlways = false;
m_inGenerate = false; m_inGenerate = false;
m_valueModp = NULL; m_valueModp = NULL;