Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

Internals: Refactor V3Expand newWordSel. No functional change intended.

Browse Source
This commit is contained in:
Wilson Snyder 2020-05-30 13:35:22 -04:00
parent 74a6f94e2b
commit b66877c9df
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/V3Expand.cpp
View File

@ -152,22 +152,22 @@ private:
return newp; return newp;
} }
AstNode* newSelBitWord(AstNode* lsbp, int wordAdder) { AstNode* newWordSel(FileLine* fl, AstNode* fromp, AstNode* lsbp, int wordAdder) {
// Return equation to get the VL_BITWORD of a constant or non-constant // Return equation to get the VL_BITWORD of a constant or non-constant
AstNode* wordp;
if (VN_IS(lsbp, Const)) { if (VN_IS(lsbp, Const)) {
return new AstConst(lsbp->fileline(), wordp = new AstConst(lsbp->fileline(),
wordAdder + VL_BITWORD_E(VN_CAST(lsbp, Const)->toUInt())); wordAdder + VL_BITWORD_E(VN_CAST(lsbp, Const)->toUInt()));
} else { } else {
AstNode* shiftp wordp = new AstShiftR(lsbp->fileline(), lsbp->cloneTree(true),
= new AstShiftR(lsbp->fileline(), lsbp->cloneTree(true), new AstConst(lsbp->fileline(), VL_EDATASIZE_LOG2), VL_EDATASIZE);
new AstConst(lsbp->fileline(), VL_EDATASIZE_LOG2), VL_EDATASIZE);
if (wordAdder != 0) { if (wordAdder != 0) {
shiftp = new AstAdd(lsbp->fileline(), wordp = new AstAdd(lsbp->fileline(),
// This is indexing a arraysel, so a 32 bit constant is fine // This is indexing a arraysel, so a 32 bit constant is fine
new AstConst(lsbp->fileline(), wordAdder), shiftp); new AstConst(lsbp->fileline(), wordAdder), wordp);
} }
return shiftp;
} }
return new AstWordSel(fl, fromp, wordp);
} }
AstNode* dropCondBound(AstNode* nodep) { AstNode* dropCondBound(AstNode* nodep) {
@ -335,9 +335,8 @@ private:
// Selection amounts // Selection amounts
// Check for constant shifts & save some constification work later. // Check for constant shifts & save some constification work later.
// Grab lowest bit(s) // Grab lowest bit(s)
AstNode* lowwordp AstNode* lowwordp = newWordSel(nodep->fromp()->fileline(),
= new AstWordSel(nodep->fromp()->fileline(), nodep->fromp()->cloneTree(true), nodep->fromp()->cloneTree(true), nodep->lsbp(), 0);
newSelBitWord(nodep->lsbp(), 0));
if (nodep->isQuad() && !lowwordp->isQuad()) { if (nodep->isQuad() && !lowwordp->isQuad()) {
lowwordp = new AstCCast(nodep->fileline(), lowwordp, nodep); lowwordp = new AstCCast(nodep->fileline(), lowwordp, nodep);
} }
@ -348,8 +347,8 @@ private:
V3Number zero(nodep, longOrQuadWidth(nodep)); V3Number zero(nodep, longOrQuadWidth(nodep));
if (nodep->widthConst() > 1) { if (nodep->widthConst() > 1) {
AstNode* midwordp = // SEL(from,[1+wordnum]) AstNode* midwordp = // SEL(from,[1+wordnum])
new AstWordSel(nodep->fromp()->fileline(), nodep->fromp()->cloneTree(true), newWordSel(nodep->fromp()->fileline(), nodep->fromp()->cloneTree(true),
newSelBitWord(nodep->lsbp(), 1)); nodep->lsbp(), 1);
if (nodep->isQuad() && !midwordp->isQuad()) { if (nodep->isQuad() && !midwordp->isQuad()) {
midwordp = new AstCCast(nodep->fileline(), midwordp, nodep); midwordp = new AstCCast(nodep->fileline(), midwordp, nodep);
} }
@ -384,8 +383,8 @@ private:
AstNode* hip = NULL; AstNode* hip = NULL;
if (nodep->widthConst() > VL_EDATASIZE) { if (nodep->widthConst() > VL_EDATASIZE) {
AstNode* hiwordp = // SEL(from,[2+wordnum]) AstNode* hiwordp = // SEL(from,[2+wordnum])
new AstWordSel(nodep->fromp()->fileline(), nodep->fromp()->cloneTree(true), newWordSel(nodep->fromp()->fileline(), nodep->fromp()->cloneTree(true),
newSelBitWord(nodep->lsbp(), 2)); nodep->lsbp(), 2);
if (nodep->isQuad() && !hiwordp->isQuad()) { if (nodep->isQuad() && !hiwordp->isQuad()) {
hiwordp = new AstCCast(nodep->fileline(), hiwordp, nodep); hiwordp = new AstCCast(nodep->fileline(), hiwordp, nodep);
} }
@ -440,16 +439,15 @@ private:
UINFO(8, " Wordize ASSIGN(EXTRACT,misalign) " << nodep << endl); UINFO(8, " Wordize ASSIGN(EXTRACT,misalign) " << nodep << endl);
for (int w = 0; w < nodep->widthWords(); w++) { for (int w = 0; w < nodep->widthWords(); w++) {
// Grab lowest bits // Grab lowest bits
AstNode* lowwordp AstNode* lowwordp = newWordSel(rhsp->fileline(), rhsp->fromp()->cloneTree(true),
= new AstWordSel(rhsp->fileline(), rhsp->fromp()->cloneTree(true), rhsp->lsbp(), w);
newSelBitWord(rhsp->lsbp(), w));
AstNode* lowp = new AstShiftR(rhsp->fileline(), lowwordp, AstNode* lowp = new AstShiftR(rhsp->fileline(), lowwordp,
newSelBitBit(rhsp->lsbp()), VL_EDATASIZE); newSelBitBit(rhsp->lsbp()), VL_EDATASIZE);
// Upper bits // Upper bits
V3Number zero(nodep, VL_EDATASIZE, 0); V3Number zero(nodep, VL_EDATASIZE, 0);
AstNode* midwordp = // SEL(from,[1+wordnum]) AstNode* midwordp = // SEL(from,[1+wordnum])
new AstWordSel(rhsp->fromp()->fileline(), rhsp->fromp()->cloneTree(true), newWordSel(rhsp->fromp()->fileline(), rhsp->fromp()->cloneTree(true),
newSelBitWord(rhsp->lsbp(), w + 1)); rhsp->lsbp(), w + 1);
AstNode* midshiftp = new AstSub( AstNode* midshiftp = new AstSub(
rhsp->lsbp()->fileline(), new AstConst(rhsp->lsbp()->fileline(), VL_EDATASIZE), rhsp->lsbp()->fileline(), new AstConst(rhsp->lsbp()->fileline(), VL_EDATASIZE),
newSelBitBit(rhsp->lsbp())); newSelBitBit(rhsp->lsbp()));
@ -532,8 +530,8 @@ private:
UINFO(8, " ASSIGNSEL(varlsb,wide,1bit) " << nodep << endl); UINFO(8, " ASSIGNSEL(varlsb,wide,1bit) " << nodep << endl);
AstNode* rhsp = nodep->rhsp()->unlinkFrBack(); AstNode* rhsp = nodep->rhsp()->unlinkFrBack();
AstNode* destp = lhsp->fromp()->unlinkFrBack(); AstNode* destp = lhsp->fromp()->unlinkFrBack();
AstNode* oldvalp = new AstWordSel(lhsp->fileline(), destp->cloneTree(true), AstNode* oldvalp
newSelBitWord(lhsp->lsbp(), 0)); = newWordSel(lhsp->fileline(), destp->cloneTree(true), lhsp->lsbp(), 0);
fixCloneLvalue(oldvalp); fixCloneLvalue(oldvalp);
if (!ones) { if (!ones) {
oldvalp = new AstAnd( oldvalp = new AstAnd(
@ -553,10 +551,8 @@ private:
AstNode* newp AstNode* newp
= new AstOr(lhsp->fileline(), oldvalp, = new AstOr(lhsp->fileline(), oldvalp,
new AstShiftL(lhsp->fileline(), rhsp, shiftp, VL_EDATASIZE)); new AstShiftL(lhsp->fileline(), rhsp, shiftp, VL_EDATASIZE));
newp = new AstAssign( newp = new AstAssign(nodep->fileline(),
nodep->fileline(), newWordSel(nodep->fileline(), destp, lhsp->lsbp(), 0), newp);
new AstWordSel(nodep->fileline(), destp, newSelBitWord(lhsp->lsbp(), 0)),
newp);
insertBefore(nodep, newp); insertBefore(nodep, newp);
return true; return true;
} else if (destwide) { } else if (destwide) {