github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-31 18:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Internal: Add node objects to UASSERT (#3786)

Browse Source
This commit is contained in:
Wilson Snyder 2022-11-29 18:32:28 -05:00
parent f0a7abcef8
commit b51bb4d0e7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/V3Const.cpp
View File

@ -100,12 +100,12 @@ class ConstBitOpTreeVisitor final : public VNVisitor {
// METHODS // METHODS
void setLeaf(AstVarRef* refp) { void setLeaf(AstVarRef* refp) {
UASSERT(!m_refp && !m_constp, "Must be called just once"); UASSERT_OBJ(!m_refp && !m_constp, refp, "Must be called just once");
m_refp = refp; m_refp = refp;
m_msb = refp->varp()->widthMin() - 1; m_msb = refp->varp()->widthMin() - 1;
} }
void setLeaf(const AstConst* constp) { void setLeaf(const AstConst* constp) {
UASSERT(!m_refp && !m_constp, "Must be called just once"); UASSERT_OBJ(!m_refp && !m_constp, constp, "Must be called just once");
m_constp = constp; m_constp = constp;
m_msb = constp->widthMin() - 1; m_msb = constp->widthMin() - 1;
} }
@ -129,10 +129,10 @@ class ConstBitOpTreeVisitor final : public VNVisitor {
UASSERT(m_refp, "m_refp should be set"); UASSERT(m_refp, "m_refp should be set");
const int width = m_refp->varp()->widthMin(); const int width = m_refp->varp()->widthMin();
if (!m_refp->isWide()) { if (!m_refp->isWide()) {
UASSERT(m_wordIdx == -1, "Bad word index into non-wide"); UASSERT_OBJ(m_wordIdx == -1, m_refp, "Bad word index into non-wide");
return width; return width;
} else { } else {
UASSERT(m_wordIdx >= 0, "Bad word index into wide"); UASSERT_OBJ(m_wordIdx >= 0, m_refp, "Bad word index into wide");
const int bitsInMSW = VL_BITBIT_E(width) ? VL_BITBIT_E(width) : VL_EDATASIZE; const int bitsInMSW = VL_BITBIT_E(width) ? VL_BITBIT_E(width) : VL_EDATASIZE;
return m_wordIdx == m_refp->widthWords() - 1 ? bitsInMSW : VL_EDATASIZE; return m_wordIdx == m_refp->widthWords() - 1 ? bitsInMSW : VL_EDATASIZE;
} }
@ -239,7 +239,7 @@ class ConstBitOpTreeVisitor final : public VNVisitor {
// Return reduction term for this VarInfo, together with the number of ops in the term, // Return reduction term for this VarInfo, together with the number of ops in the term,
// and a boolean indicating if the term is clean (1-bit vs multi-bit value) // and a boolean indicating if the term is clean (1-bit vs multi-bit value)
ResultTerm getResultTerm() const { ResultTerm getResultTerm() const {
UASSERT(!hasConstResult(), "getTerm on reduction that yields constant"); UASSERT_OBJ(!hasConstResult(), m_refp, "getTerm on reduction that yields constant");
FileLine* const fl = m_refp->fileline(); FileLine* const fl = m_refp->fileline();
// Get the term we are referencing (the WordSel, if wide, otherwise just the VarRef) // Get the term we are referencing (the WordSel, if wide, otherwise just the VarRef)
@ -257,7 +257,8 @@ class ConstBitOpTreeVisitor final : public VNVisitor {
V3Number maskNum{srcp, m_width, 0}; V3Number maskNum{srcp, m_width, 0};
maskNum.opBitsNonX(m_bitPolarity); // 'x' -> 0, 0->1, 1->1 maskNum.opBitsNonX(m_bitPolarity); // 'x' -> 0, 0->1, 1->1
const uint64_t maskVal = maskNum.toUQuad(); const uint64_t maskVal = maskNum.toUQuad();
UASSERT(maskVal != 0, "Should have been recognized as having const 0 result"); UASSERT_OBJ(maskVal != 0, m_refp,
"Should have been recognized as having const 0 result");
// Parts of the return value // Parts of the return value
AstNodeExpr* resultp = srcp; // The tree for this term AstNodeExpr* resultp = srcp; // The tree for this term