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

Fix sign-extension underneath boolean operators. (In theory shouldn't matter, since comparing to zero.)

This commit is contained in:
Wilson Snyder 2012-05-11 18:26:45 -04:00
parent 3087501b6c
commit 6d0f39d841
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/V3Width.cpp
View File

@ -1770,17 +1770,19 @@ private:
UINFO(4," _new: "<<nodep<<endl); UINFO(4," _new: "<<nodep<<endl);
} }
void fixWidthReduce (AstNode* nodep, int expWidth) { void fixWidthReduce (AstNode* nodep) {
// Fix the width mismatch by adding a reduction OR operator // Fix the width mismatch by adding a reduction OR operator
// IF (A(CONSTwide)) becomes IF (A(CONSTreduced)) // IF (A(CONSTwide)) becomes IF (A(CONSTreduced))
// IF (A(somewide)) becomes IF (A(REDOR(somewide))) // IF (A(somewide)) becomes IF (A(REDOR(somewide)))
// Attempt to fix it quietly // Attempt to fix it quietly
int expWidth = 1;
int expSigned = false;
UINFO(4," widthReduce_old: "<<nodep<<endl); UINFO(4," widthReduce_old: "<<nodep<<endl);
AstConst* constp = nodep->castConst(); AstConst* constp = nodep->castConst();
if (constp) { if (constp) {
V3Number num (nodep->fileline(), expWidth); V3Number num (nodep->fileline(), expWidth);
num.opRedOr(constp->num()); num.opRedOr(constp->num());
num.isSigned(constp->isSigned()); num.isSigned(expSigned);
AstNode* newp = new AstConst(nodep->fileline(), num); AstNode* newp = new AstConst(nodep->fileline(), num);
constp->replaceWith(newp); constp->replaceWith(newp);
nodep=newp; nodep=newp;
@ -1791,7 +1793,7 @@ private:
linker.relink(newp); linker.relink(newp);
nodep=newp; nodep=newp;
} }
nodep->dtypeChgWidth(expWidth,expWidth); nodep->dtypeChgWidthSigned(expWidth,expWidth,expSigned);
UINFO(4," _new: "<<nodep<<endl); UINFO(4," _new: "<<nodep<<endl);
} }
@ -1871,7 +1873,7 @@ private:
?" or "+cvtToStr(underp->widthMin()):"") ?" or "+cvtToStr(underp->widthMin()):"")
<<" bits."); <<" bits.");
} }
fixWidthReduce(underp, expWidth); underp=NULL;//Changed fixWidthReduce(underp); underp=NULL;//Changed
} }
} }