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

Fix duplicate Vdimtables and rename

This commit is contained in:
Wilson Snyder 2014-11-28 20:25:58 -05:00
parent ce4dfb4296
commit 93f1d7643d
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/V3Width.cpp
View File

@ -77,6 +77,7 @@
#include "V3Width.h" #include "V3Width.h"
#include "V3Number.h" #include "V3Number.h"
#include "V3Const.h" #include "V3Const.h"
#include "V3String.h"
#include "V3Task.h" #include "V3Task.h"
// More code; this file was getting too large; see actions there // More code; this file was getting too large; see actions there
@ -154,6 +155,10 @@ ostream& operator<<(ostream& str, const WidthVP* vup) {
class WidthVisitor : public AstNVisitor { class WidthVisitor : public AstNVisitor {
private: private:
// TYPES
typedef map<pair<AstNodeDType*,AstAttrType>, AstVar*> TableMap;
typedef map<int,AstPatMember*> PatVecMap;
// STATE // STATE
bool m_paramsOnly; // Computing parameter value; limit operation bool m_paramsOnly; // Computing parameter value; limit operation
AstRange* m_cellRangep; // Range for arrayed instantiations, NULL for normal instantiations AstRange* m_cellRangep; // Range for arrayed instantiations, NULL for normal instantiations
@ -162,9 +167,7 @@ private:
AstAttrOf* m_attrp; // Current attribute AstAttrOf* m_attrp; // Current attribute
bool m_doGenerate; // Do errors later inside generate statement bool m_doGenerate; // Do errors later inside generate statement
int m_dtTables; // Number of created data type tables int m_dtTables; // Number of created data type tables
TableMap m_tableMap; // Created tables so can remove duplicates
// TYPES
typedef map<int,AstPatMember*> PatVecMap;
// ENUMS // ENUMS
enum ExtendRule { enum ExtendRule {
@ -3179,13 +3182,17 @@ private:
} }
AstVar* dimensionVarp(AstNodeDType* nodep, AstAttrType attrType, uint32_t maxdim) { AstVar* dimensionVarp(AstNodeDType* nodep, AstAttrType attrType, uint32_t maxdim) {
// Return a variable table which has specified dimension properties for this variable // Return a variable table which has specified dimension properties for this variable
TableMap::iterator pos = m_tableMap.find(make_pair(nodep,attrType));
if (pos != m_tableMap.end()) {
return pos->second;
}
AstNodeArrayDType* vardtypep = new AstUnpackArrayDType(nodep->fileline(), AstNodeArrayDType* vardtypep = new AstUnpackArrayDType(nodep->fileline(),
nodep->findSigned32DType(), nodep->findSigned32DType(),
new AstRange(nodep->fileline(), maxdim, 0)); new AstRange(nodep->fileline(), maxdim, 0));
AstInitArray* initp = new AstInitArray (nodep->fileline(), vardtypep, NULL); AstInitArray* initp = new AstInitArray (nodep->fileline(), vardtypep, NULL);
v3Global.rootp()->typeTablep()->addTypesp(vardtypep); v3Global.rootp()->typeTablep()->addTypesp(vardtypep);
AstVar* varp = new AstVar (nodep->fileline(), AstVarType::MODULETEMP, AstVar* varp = new AstVar (nodep->fileline(), AstVarType::MODULETEMP,
"__Vdimtable" + cvtToStr(m_dtTables++), "__Vdimtab_" + VString::downcase(attrType.ascii()) + cvtToStr(m_dtTables++),
vardtypep); vardtypep);
varp->isConst(true); varp->isConst(true);
varp->isStatic(true); varp->isStatic(true);
@ -3198,6 +3205,7 @@ private:
initp->addInitsp(dimensionValue(nodep, attrType, i)); initp->addInitsp(dimensionValue(nodep, attrType, i));
} }
varp->iterate(*this); // May have already done $unit so must do this var varp->iterate(*this); // May have already done $unit so must do this var
m_tableMap.insert(make_pair(make_pair(nodep,attrType), varp));
return varp; return varp;
} }