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

Internals: Make propagateAttrClocksFrom. No functional change.

This commit is contained in:
Wilson Snyder 2013-02-16 08:07:18 -05:00
parent 18eb210313
commit e71baca39b
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/V3Gate.cpp
View File

@ -66,7 +66,7 @@ public:
GateEitherVertex(V3Graph* graphp, AstScope* scopep) GateEitherVertex(V3Graph* graphp, AstScope* scopep)
: V3GraphVertex(graphp), m_scopep(scopep), m_reducible(true), m_consumed(false) {} : V3GraphVertex(graphp), m_scopep(scopep), m_reducible(true), m_consumed(false) {}
virtual ~GateEitherVertex() {} virtual ~GateEitherVertex() {}
// Accessors // ACCESSORS
virtual string dotStyle() const { return m_consumed?"":"dotted"; } virtual string dotStyle() const { return m_consumed?"":"dotted"; }
AstScope* scopep() const { return m_scopep; } AstScope* scopep() const { return m_scopep; }
bool reducible() const { return m_reducible; } bool reducible() const { return m_reducible; }
@ -92,7 +92,7 @@ public:
: GateEitherVertex(graphp, scopep), m_varScp(varScp), m_isTop(false) : GateEitherVertex(graphp, scopep), m_varScp(varScp), m_isTop(false)
, m_isClock(false), m_rstSyncNodep(NULL), m_rstAsyncNodep(NULL) {} , m_isClock(false), m_rstSyncNodep(NULL), m_rstAsyncNodep(NULL) {}
virtual ~GateVarVertex() {} virtual ~GateVarVertex() {}
// Accessors // ACCESSORS
AstVarScope* varScp() const { return m_varScp; } AstVarScope* varScp() const { return m_varScp; }
virtual string name() const { return (cvtToStr((void*)m_varScp)+" "+varScp()->name()); } virtual string name() const { return (cvtToStr((void*)m_varScp)+" "+varScp()->name()); }
virtual string dotColor() const { return "blue"; } virtual string dotColor() const { return "blue"; }
@ -104,6 +104,15 @@ public:
void rstSyncNodep(AstNode* nodep) { m_rstSyncNodep=nodep; } void rstSyncNodep(AstNode* nodep) { m_rstSyncNodep=nodep; }
AstNode* rstAsyncNodep() const { return m_rstAsyncNodep; } AstNode* rstAsyncNodep() const { return m_rstAsyncNodep; }
void rstAsyncNodep(AstNode* nodep) { m_rstAsyncNodep=nodep; } void rstAsyncNodep(AstNode* nodep) { m_rstAsyncNodep=nodep; }
// METHODS
void propagateAttrClocksFrom(GateVarVertex* fromp) {
// Propagate clock and general attribute onto this node
varScp()->varp()->propagateAttrFrom(fromp->varScp()->varp());
if (fromp->isClock()) {
varScp()->varp()->usedClock(true);
setIsClock();
}
}
}; };
class GateLogicVertex : public GateEitherVertex { class GateLogicVertex : public GateEitherVertex {
@ -114,7 +123,7 @@ public:
GateLogicVertex(V3Graph* graphp, AstScope* scopep, AstNode* nodep, AstActive* activep, bool slow) GateLogicVertex(V3Graph* graphp, AstScope* scopep, AstNode* nodep, AstActive* activep, bool slow)
: GateEitherVertex(graphp,scopep), m_nodep(nodep), m_activep(activep), m_slow(slow) {} : GateEitherVertex(graphp,scopep), m_nodep(nodep), m_activep(activep), m_slow(slow) {}
virtual ~GateLogicVertex() {} virtual ~GateLogicVertex() {}
// Accessors // ACCESSORS
virtual string name() const { return (cvtToStr((void*)m_nodep)+"@"+scopep()->prettyName()); } virtual string name() const { return (cvtToStr((void*)m_nodep)+"@"+scopep()->prettyName()); }
virtual string dotColor() const { return "yellow"; } virtual string dotColor() const { return "yellow"; }
AstNode* nodep() const { return m_nodep; } AstNode* nodep() const { return m_nodep; }
@ -548,12 +557,8 @@ void GateVisitor::optimizeSignals(bool allowMultiIn) {
UINFO(9," Point-to-new vertex "<<newvarscp<<endl); UINFO(9," Point-to-new vertex "<<newvarscp<<endl);
GateVarVertex* varvertexp = makeVarVertex(newvarscp); GateVarVertex* varvertexp = makeVarVertex(newvarscp);
new V3GraphEdge(&m_graph, varvertexp, consumeVertexp, 1); new V3GraphEdge(&m_graph, varvertexp, consumeVertexp, 1);
newvarscp->varp()->propagateAttrFrom(vvertexp->varScp()->varp()); // Propagate clock attribute onto generating node
if (vvertexp->isClock()) { varvertexp->propagateAttrClocksFrom(vvertexp);
// Propagate clock attribute onto generating node
newvarscp->varp()->usedClock(true);
varvertexp->setIsClock();
}
} }
// Remove the edge // Remove the edge
edgep->unlinkDelete(); edgep=NULL; edgep->unlinkDelete(); edgep=NULL;