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

Fix some expression elaborate vector width problems.

This commit is contained in:
Stephen Williams 2008-08-12 21:32:21 -07:00
parent dc6d3f4afb
commit 3def0e0dec
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
elab_expr.cc
View File

@ -179,6 +179,13 @@ NetExpr* PEBinary::elaborate_expr_base_(Design*des,
break;
case '*':
// Multiply will guess a width that is the sum of the
// widths of the operand. If that sum is too small, then
// pad one of the arguments enough that the sum is the
// desired width.
if (expr_wid > (long)(lp->expr_width() + rp->expr_width()))
lp = pad_to_width(lp, expr_wid - rp->expr_width());
tmp = new NetEBMult(op_, lp, rp);
tmp->set_line(*this);
break;
@ -247,6 +254,8 @@ NetExpr* PEBinary::elaborate_expr_base_(Design*des,
} else {
// Left side is not constant, so handle it the
// default way.
if (expr_wid >= 0)
lp = pad_to_width(lp, expr_wid);
tmp = new NetEBShift(op_, lp, rp);
}
tmp->set_line(*this);
@ -1932,6 +1941,9 @@ NetETernary*PETernary::elaborate_expr(Design*des, NetScope*scope,
return 0;
}
/* Make sure the condition expression reduces to a single bit. */
con = condition_reduce(con);
/* Whatever the width we choose for the ternary operator, we
need to make sure the operands match. */
tru = pad_to_width(tru, expr_wid);