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

Fix evaluation of out-of-bounds bit/part-select in constant function (issue #531). 

(cherry picked from commit 3b1b611a18)
This commit is contained in:
Martin Whitaker 2021-07-30 20:34:47 +01:00
parent b48cdff89e
commit c564184bd1
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
net_func_eval.cc
View File

@ -360,14 +360,9 @@ bool NetAssign::eval_func_lval_(const LineInfo&loc,
long base = base_const->value().as_long(); long base = base_const->value().as_long();
list<long>prefix (0);
base = lval->sig()->sb_to_idx(prefix, base);
if (old_lval == 0) if (old_lval == 0)
old_lval = make_const_x(lval->sig()->vector_width()); old_lval = make_const_x(lval->sig()->vector_width());
ivl_assert(loc, base + lval->lwidth() <= old_lval->expr_width());
NetEConst*lval_const = dynamic_cast<NetEConst*>(old_lval); NetEConst*lval_const = dynamic_cast<NetEConst*>(old_lval);
ivl_assert(loc, lval_const); ivl_assert(loc, lval_const);
verinum lval_v = lval_const->value(); verinum lval_v = lval_const->value();
@ -377,15 +372,20 @@ bool NetAssign::eval_func_lval_(const LineInfo&loc,
verinum lpart(verinum::Vx, lval->lwidth()); verinum lpart(verinum::Vx, lval->lwidth());
if (op_) { if (op_) {
for (unsigned idx = 0 ; idx < lpart.len() ; idx += 1) for (unsigned idx = 0 ; idx < lpart.len() ; idx += 1) {
lpart.set(idx, lval_v[base+idx]); long ldx = base + idx;
if (ldx >= 0 && ldx < lval_v.len())
lpart.set(idx, lval_v[ldx]);
}
eval_func_lval_op_(loc, lpart, rval_v); eval_func_lval_op_(loc, lpart, rval_v);
} else { } else {
lpart = cast_to_width(rval_v, lval->lwidth()); lpart = cast_to_width(rval_v, lval->lwidth());
} }
for (unsigned idx = 0 ; idx < lpart.len() ; idx += 1) for (unsigned idx = 0 ; idx < lpart.len() ; idx += 1) {
lval_v.set(idx+base, lpart[idx]); long ldx = base + idx;
if (ldx >= 0 && ldx < lval_v.len())
lval_v.set(idx+base, lpart[idx]);
}
delete base_result; delete base_result;
delete rval_result; delete rval_result;
@ -960,8 +960,11 @@ NetExpr* NetESelect::evaluate_function(const LineInfo&loc,
} }
verinum res (verinum::Vx, expr_width()); verinum res (verinum::Vx, expr_width());
for (unsigned idx = 0 ; idx < res.len() ; idx += 1) for (unsigned idx = 0 ; idx < res.len() ; idx += 1) {
res.set(idx, sub[base+idx]); long sdx = base + idx;
if (sdx >= 0 && sdx < sub.len())
res.set(idx, sub[sdx]);
}
NetEConst*res_const = new NetEConst(res); NetEConst*res_const = new NetEConst(res);
return res_const; return res_const;