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

Handle division and modulus by zero while 

evaluating run-time constants.
This commit is contained in:
steve 2001-11-19 02:54:12 +00:00
parent cfed3933fa
commit 9d1a81ce2c
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
elab_expr.cc
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) && !defined(macintosh) #if !defined(WINNT) && !defined(macintosh)
#ident "$Id: elab_expr.cc,v 1.44 2001/11/19 01:54:14 steve Exp $" #ident "$Id: elab_expr.cc,v 1.45 2001/11/19 02:54:12 steve Exp $"
#endif #endif
# include "config.h" # include "config.h"
@ -48,7 +48,6 @@ NetEBinary* PEBinary::elaborate_expr(Design*des, NetScope*scope) const
assert(left_); assert(left_);
assert(right_); assert(right_);
NetExpr*lp = left_->elaborate_expr(des, scope); NetExpr*lp = left_->elaborate_expr(des, scope);
NetExpr*rp = right_->elaborate_expr(des, scope); NetExpr*rp = right_->elaborate_expr(des, scope);
if ((lp == 0) || (rp == 0)) { if ((lp == 0) || (rp == 0)) {
@ -57,6 +56,7 @@ NetEBinary* PEBinary::elaborate_expr(Design*des, NetScope*scope) const
return 0; return 0;
} }
/* If either expression can be evaluated ahead of time, then /* If either expression can be evaluated ahead of time, then
do so. This can prove helpful later. */ do so. This can prove helpful later. */
{ NetExpr*tmp; { NetExpr*tmp;
@ -65,6 +65,7 @@ NetEBinary* PEBinary::elaborate_expr(Design*des, NetScope*scope) const
delete lp; delete lp;
lp = tmp; lp = tmp;
} }
tmp = rp->eval_tree(); tmp = rp->eval_tree();
if (tmp) { if (tmp) {
delete rp; delete rp;
@ -635,11 +636,16 @@ NetEUnary* PEUnary::elaborate_expr(Design*des, NetScope*scope) const
tmp->set_line(*this); tmp->set_line(*this);
break; break;
} }
return tmp; return tmp;
} }
/* /*
* $Log: elab_expr.cc,v $ * $Log: elab_expr.cc,v $
* Revision 1.45 2001/11/19 02:54:12 steve
* Handle division and modulus by zero while
* evaluating run-time constants.
*
* Revision 1.44 2001/11/19 01:54:14 steve * Revision 1.44 2001/11/19 01:54:14 steve
* Port close cropping behavior from mcrgb * Port close cropping behavior from mcrgb
* Move window array reset to libmc. * Move window array reset to libmc.

22
verinum.cc
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) && !defined(macintosh) #if !defined(WINNT) && !defined(macintosh)
#ident "$Id: verinum.cc,v 1.28 2001/11/06 06:11:55 steve Exp $" #ident "$Id: verinum.cc,v 1.29 2001/11/19 02:54:12 steve Exp $"
#endif #endif
# include "config.h" # include "config.h"
@ -655,6 +655,14 @@ verinum operator / (const verinum&left, const verinum&right)
return result; return result;
} }
/* If the right expression is a zero value, then the result is
filled with 'bx bits. */
if (right.as_ulong() == 0) {
verinum result (verinum::Vx, use_len, has_len_flag);
result.has_sign(left.has_sign() || right.has_sign());
return result;
}
verinum result(verinum::Vz, use_len, has_len_flag); verinum result(verinum::Vz, use_len, has_len_flag);
result.has_sign(left.has_sign() || right.has_sign()); result.has_sign(left.has_sign() || right.has_sign());
@ -707,6 +715,14 @@ verinum operator % (const verinum&left, const verinum&right)
return result; return result;
} }
/* If the right expression is a zero value, then the result is
filled with 'bx bits. */
if (right.as_ulong() == 0) {
verinum result (verinum::Vx, use_len, has_len_flag);
result.has_sign(left.has_sign() || right.has_sign());
return result;
}
verinum result(verinum::Vz, use_len, has_len_flag); verinum result(verinum::Vz, use_len, has_len_flag);
result.has_sign(left.has_sign() || right.has_sign()); result.has_sign(left.has_sign() || right.has_sign());
@ -770,6 +786,10 @@ verinum::V operator & (verinum::V l, verinum::V r)
/* /*
* $Log: verinum.cc,v $ * $Log: verinum.cc,v $
* Revision 1.29 2001/11/19 02:54:12 steve
* Handle division and modulus by zero while
* evaluating run-time constants.
*
* Revision 1.28 2001/11/06 06:11:55 steve * Revision 1.28 2001/11/06 06:11:55 steve
* Support more real arithmetic in delay constants. * Support more real arithmetic in delay constants.
* *