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

Fix GCC false warning on array bounds. (#2386)

Browse Source
This commit is contained in:
Wilson Snyder 2020-05-30 13:47:42 -04:00
parent b66877c9df
commit 2e32387e5c
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -681,6 +681,8 @@ The contributors that suggested a given feature are shown in []. Thanks!
**** Fix resolving inline nested interface names. (#1250) [Arjen Roodselaar]
**** Fix GCC false warning on array bounds. (#2386)
* Verilator 3.916 2017-11-25

32
src/V3Expand.cpp
View File

@ -154,20 +154,30 @@ private:
AstNode* newWordSel(FileLine* fl, AstNode* fromp, AstNode* lsbp, int wordAdder) {
// Return equation to get the VL_BITWORD of a constant or non-constant
AstNode* wordp;
if (VN_IS(lsbp, Const)) {
wordp = new AstConst(lsbp->fileline(),
wordAdder + VL_BITWORD_E(VN_CAST(lsbp, Const)->toUInt()));
UASSERT_OBJ(fromp->isWide(), fromp, "Only need AstWordSel on wide from's");
if (wordAdder >= fromp->widthWords()) {
// e.g. "logic [95:0] var[0]; logic [0] sel; out = var[sel];"
// Squash before C++ to avoid getting a C++ compiler warning
// (even though code would be unreachable as presumably a
// AstCondBound is protecting above this node.
return new AstConst(fl, AstConst::SizedEData(), 0);
} else {
wordp = new AstShiftR(lsbp->fileline(), lsbp->cloneTree(true),
new AstConst(lsbp->fileline(), VL_EDATASIZE_LOG2), VL_EDATASIZE);
if (wordAdder != 0) {
wordp = new AstAdd(lsbp->fileline(),
// This is indexing a arraysel, so a 32 bit constant is fine
new AstConst(lsbp->fileline(), wordAdder), wordp);
AstNode* wordp;
if (VN_IS(lsbp, Const)) {
wordp = new AstConst(lsbp->fileline(),
wordAdder + VL_BITWORD_E(VN_CAST(lsbp, Const)->toUInt()));
} else {
wordp = new AstShiftR(lsbp->fileline(), lsbp->cloneTree(true),
new AstConst(lsbp->fileline(), VL_EDATASIZE_LOG2),
VL_EDATASIZE);
if (wordAdder != 0) {
wordp = new AstAdd(lsbp->fileline(),
// This is indexing a arraysel, so a 32 bit constant is fine
new AstConst(lsbp->fileline(), wordAdder), wordp);
}
}
return new AstWordSel(fl, fromp, wordp);
}
return new AstWordSel(fl, fromp, wordp);
}
AstNode* dropCondBound(AstNode* nodep) {