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

Internals: Remove dimension and use only dtypes for V3Width.

This commit is contained in:
Wilson Snyder 2013-01-13 15:21:38 -05:00
parent 13bf2f19ac
commit 7a8184d206
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/V3AstNodes.cpp
View File

@ -386,20 +386,6 @@ int AstNodeDType::widthPow2() const {
return 1; return 1;
} }
// Special operators
int AstArraySel::dimension(AstNode* nodep) {
// How many dimensions is this reference from the base variable?
// nodep is typically the fromp() of a select; thus the first select
// is selecting from the entire variable type - effectively dimension 0.
// Dimension passed to AstVar::dtypeDimensionp; see comments there
int dim = 0;
while (nodep) {
if (nodep->castNodeSel()) { dim++; nodep=nodep->castNodeSel()->fromp(); continue; }
if (nodep->castNodePreSel()) { dim++; nodep=nodep->castNodePreSel()->fromp(); continue; }
break;
}
return dim;
}
AstNode* AstArraySel::baseFromp(AstNode* nodep) { ///< What is the base variable (or const) this dereferences? AstNode* AstArraySel::baseFromp(AstNode* nodep) { ///< What is the base variable (or const) this dereferences?
// Else AstArraySel etc; search for the base // Else AstArraySel etc; search for the base
while (nodep) { while (nodep) {

1
src/V3AstNodes.h
View File

@ -650,7 +650,6 @@ public:
void start(unsigned start) { m_start = start; } void start(unsigned start) { m_start = start; }
unsigned start() const { return m_start; } unsigned start() const { return m_start; }
// Special operators // Special operators
static int dimension(AstNode* nodep); ///< How many dimensions is this reference from the base variable?
static AstNode* baseFromp(AstNode* nodep); ///< What is the base variable (or const) this dereferences? static AstNode* baseFromp(AstNode* nodep); ///< What is the base variable (or const) this dereferences?
virtual void dump(ostream& str); virtual void dump(ostream& str);
}; };

13
src/V3Width.cpp
View File

@ -504,15 +504,11 @@ private:
checkCvtUS(nodep->bitp()); checkCvtUS(nodep->bitp());
// //
nodep->fromp()->iterateAndNext(*this,WidthVP(ANYSIZE,0,PRELIM).p()); nodep->fromp()->iterateAndNext(*this,WidthVP(ANYSIZE,0,PRELIM).p());
AstNode* basefromp = AstArraySel::baseFromp(nodep->fromp());
int dimension = AstArraySel::dimension(nodep->fromp());
AstNodeVarRef* varrp = basefromp->castNodeVarRef();
if (!varrp) nodep->v3fatalSrc("No VarRef found under ArraySel(s)");
// //
int frommsb; int frommsb;
int fromlsb; int fromlsb;
AstNodeDType* ddtypep = varrp->varp()->dtypep()->dtypeDimensionp(dimension); AstNodeDType* fromDtp = nodep->fromp()->dtypep()->skipRefp();
if (AstNodeArrayDType* adtypep = ddtypep->castNodeArrayDType()) { if (AstNodeArrayDType* adtypep = fromDtp->castNodeArrayDType()) {
frommsb = adtypep->msb(); frommsb = adtypep->msb();
fromlsb = adtypep->lsb(); fromlsb = adtypep->lsb();
if (fromlsb>frommsb) {int t=frommsb; frommsb=fromlsb; fromlsb=t; } if (fromlsb>frommsb) {int t=frommsb; frommsb=fromlsb; fromlsb=t; }
@ -521,9 +517,8 @@ private:
nodep->dtypeFrom(adtypep->subDTypep()); // Need to strip off array reference nodep->dtypeFrom(adtypep->subDTypep()); // Need to strip off array reference
} }
else { else {
UINFO(1," Related var dtypep: "<<varrp->varp()->dtypep()<<endl); // Note PackArrayDType doesn't use an ArraySel but a normal Sel.
UINFO(1," Related ddtypep: "<<ddtypep<<endl); UINFO(1," Related dtype: "<<fromDtp<<endl);
UINFO(1," Related dimension: "<<dimension<<endl);
nodep->v3fatalSrc("Array reference exceeds dimension of array"); nodep->v3fatalSrc("Array reference exceeds dimension of array");
frommsb = fromlsb = 0; frommsb = fromlsb = 0;
} }