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

Internals: findBit etc can be const. No functional change.

This commit is contained in:
Wilson Snyder 2012-07-23 21:29:53 -04:00
parent dee7210231
commit e655c85489
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/V3Ast.cpp
View File

@ -1082,17 +1082,17 @@ void AstNode::dtypeChgWidthSigned(int width, int widthMin, bool issigned) {
} }
} }
AstNodeDType* AstNode::findBasicDType(AstBasicDTypeKwd kwd) { AstNodeDType* AstNode::findBasicDType(AstBasicDTypeKwd kwd) const {
// For 'simple' types we use the global directory. These are all unsized. // For 'simple' types we use the global directory. These are all unsized.
// More advanced types land under the module/task/etc // More advanced types land under the module/task/etc
return v3Global.rootp()->typeTablep() return v3Global.rootp()->typeTablep()
->findBasicDType(fileline(), kwd); ->findBasicDType(fileline(), kwd);
} }
AstNodeDType* AstNode::findBitDType(int width, int widthMin, AstNumeric numeric) { AstNodeDType* AstNode::findBitDType(int width, int widthMin, AstNumeric numeric) const {
return v3Global.rootp()->typeTablep() return v3Global.rootp()->typeTablep()
->findLogicBitDType(fileline(), AstBasicDTypeKwd::BIT, width, widthMin, numeric); ->findLogicBitDType(fileline(), AstBasicDTypeKwd::BIT, width, widthMin, numeric);
} }
AstNodeDType* AstNode::findLogicDType(int width, int widthMin, AstNumeric numeric) { AstNodeDType* AstNode::findLogicDType(int width, int widthMin, AstNumeric numeric) const {
return v3Global.rootp()->typeTablep() return v3Global.rootp()->typeTablep()
->findLogicBitDType(fileline(), AstBasicDTypeKwd::LOGIC, width, widthMin, numeric); ->findLogicBitDType(fileline(), AstBasicDTypeKwd::LOGIC, width, widthMin, numeric);
} }

6
src/V3Ast.h
View File

@ -1070,9 +1070,9 @@ public:
AstNodeDType* findSigned32DType() { return findBasicDType(AstBasicDTypeKwd::INTEGER); } AstNodeDType* findSigned32DType() { return findBasicDType(AstBasicDTypeKwd::INTEGER); }
AstNodeDType* findUInt32DType() { return findBasicDType(AstBasicDTypeKwd::UINT32); } // Twostate AstNodeDType* findUInt32DType() { return findBasicDType(AstBasicDTypeKwd::UINT32); } // Twostate
AstNodeDType* findUInt64DType() { return findBasicDType(AstBasicDTypeKwd::UINT64); } // Twostate AstNodeDType* findUInt64DType() { return findBasicDType(AstBasicDTypeKwd::UINT64); } // Twostate
AstNodeDType* findBitDType(int width, int widthMin, AstNumeric numeric); AstNodeDType* findBitDType(int width, int widthMin, AstNumeric numeric) const;
AstNodeDType* findLogicDType(int width, int widthMin, AstNumeric numeric); AstNodeDType* findLogicDType(int width, int widthMin, AstNumeric numeric) const;
AstNodeDType* findBasicDType(AstBasicDTypeKwd kwd); AstNodeDType* findBasicDType(AstBasicDTypeKwd kwd) const;
AstBasicDType* findInsertSameDType(AstBasicDType* nodep); AstBasicDType* findInsertSameDType(AstBasicDType* nodep);
// METHODS - dump and error // METHODS - dump and error

4
src/V3Width.cpp
View File

@ -420,7 +420,9 @@ private:
int frommsb = nodep->fromp()->width() - 1; int frommsb = nodep->fromp()->width() - 1;
int fromlsb = 0; int fromlsb = 0;
AstNodeVarRef* varrp = nodep->fromp()->castNodeVarRef(); AstNodeVarRef* varrp = nodep->fromp()->castNodeVarRef();
if (varrp && varrp->varp()->basicp()->isRanged()) { // Selecting a bit from a multibit register if (varrp
&& varrp->varp()->basicp()
&& varrp->varp()->basicp()->isRanged()) { // Selecting a bit from a multibit register
frommsb = varrp->varp()->basicp()->msbMaxSelect(); // Corrected for negative lsb frommsb = varrp->varp()->basicp()->msbMaxSelect(); // Corrected for negative lsb
fromlsb = varrp->varp()->basicp()->lsb(); fromlsb = varrp->varp()->basicp()->lsb();
} }