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

Comparison arguments are in a self determined context. 

This patch makes comparison arguments be evaluated in a self
determined context. It also cleans up some other code items.
This commit is contained in:
Cary R 2008-06-13 15:50:17 -07:00 committed by Stephen Williams
parent 6f9643df79
commit 50a8c17cf8
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
elab_net.cc
View File

@ -137,7 +137,7 @@ NetNet* PEBinary::elaborate_net_add_(Design*des, NetScope*scope,
const NetExpr* decay) const const NetExpr* decay) const
{ {
NetNet*lsig = left_->elaborate_net(des, scope, lwidth, 0, 0, 0), NetNet*lsig = left_->elaborate_net(des, scope, lwidth, 0, 0, 0),
*rsig = right_->elaborate_net(des, scope, lwidth, 0, 0, 0); *rsig = right_->elaborate_net(des, scope, lwidth, 0, 0, 0);
if (lsig == 0 || rsig == 0) return 0; if (lsig == 0 || rsig == 0) return 0;
@ -449,26 +449,21 @@ NetNet* PEBinary::elaborate_net_cmp_(Design*des, NetScope*scope,
const NetExpr* fall, const NetExpr* fall,
const NetExpr* decay) const const NetExpr* decay) const
{ {
/* Elaborate the operands of the compare first as expressions /* Elaborate the operands of the compare first as expressions
(so that the eval_tree method can reduce constant (so that the eval_tree method can reduce constant
expressions, including parameters) then turn those results expressions, including parameters) then turn those results
into synthesized nets. */ into synthesized nets. */
NetExpr*lexp = elab_and_eval(des, scope, left_, lwidth), NetExpr*lexp = elab_and_eval(des, scope, left_, -1),
*rexp = elab_and_eval(des, scope, right_, lwidth); *rexp = elab_and_eval(des, scope, right_, -1);
if (lexp == 0 || rexp == 0) return 0; if (lexp == 0 || rexp == 0) return 0;
unsigned operand_width; bool real_arg = true;
bool real_arg = false; if (lexp->expr_type() != IVL_VT_REAL &&
if (lexp->expr_type() == IVL_VT_REAL || rexp->expr_type() != IVL_VT_REAL) {
rexp->expr_type() == IVL_VT_REAL) {
operand_width = 1;
real_arg = true;
} else {
/* Choose the operand width to be the width of the widest /* Choose the operand width to be the width of the widest
self-determined operand. */ self-determined operand. */
operand_width = lexp->expr_width(); unsigned operand_width = lexp->expr_width();
if (rexp->expr_width() > operand_width) if (rexp->expr_width() > operand_width)
operand_width = rexp->expr_width(); operand_width = rexp->expr_width();
@ -476,6 +471,8 @@ NetNet* PEBinary::elaborate_net_cmp_(Design*des, NetScope*scope,
lexp = pad_to_width(lexp, operand_width); lexp = pad_to_width(lexp, operand_width);
rexp->set_width(operand_width); rexp->set_width(operand_width);
rexp = pad_to_width(rexp, operand_width); rexp = pad_to_width(rexp, operand_width);
real_arg = false;
} }
NetNet*lsig = 0; NetNet*lsig = 0;
@ -790,8 +787,8 @@ NetNet* PEBinary::elaborate_net_mod_(Design*des, NetScope*scope,
const NetExpr* fall, const NetExpr* fall,
const NetExpr* decay) const const NetExpr* decay) const
{ {
NetNet*lsig = left_->elaborate_net(des, scope, 0, 0, 0, 0), NetNet*lsig = left_->elaborate_net(des, scope, lwidth, 0, 0, 0),
*rsig = right_->elaborate_net(des, scope, 0, 0, 0, 0); *rsig = right_->elaborate_net(des, scope, lwidth, 0, 0, 0);
if (lsig == 0 || rsig == 0) return 0; if (lsig == 0 || rsig == 0) return 0;

2
elaborate.cc
View File

@ -94,7 +94,7 @@ void PGAssign::elaborate(Design*des, NetScope*scope) const
assert(lval->pin_count() == 1); assert(lval->pin_count() == 1);
if (debug_elaborate) { if (debug_elaborate) {
cerr << get_fileline() << ": debug: PGassign: elaborated l-value" cerr << get_fileline() << ": debug: PGAssign: elaborated l-value"
<< " width=" << lval->vector_width() << " width=" << lval->vector_width()
<< ", type=" << lval->data_type() << endl; << ", type=" << lval->data_type() << endl;
} }