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

Add more error checking for operators that cannot use real values. 

This patch adds some checks to verify that  shifts, the reduction
operators and the bit wise operators are not used with real values.
It also includes a few other cleanups.
This commit is contained in:
Cary R 2008-01-31 19:08:30 -08:00 committed by Stephen Williams
parent 1595ae79fd
commit db851c235f
1 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
elab_net.cc
View File

@ -98,8 +98,6 @@ NetNet* PEBinary::elaborate_net(Design*des, NetScope*scope,
case 'r': // >>
case 'R': // >>>
return elaborate_net_shift_(des, scope, width, rise, fall, decay);
return 0;
}
/* This is an undefined operator, but we may as well check the
@ -208,6 +206,7 @@ NetNet* PEBinary::elaborate_net_add_(Design*des, NetScope*scope,
<< lsig->data_type() << ", right argument is "
<< rsig->data_type() << "." << endl;
des->errors += 1;
return 0;
}
// Make the adder as wide as the widest operand
@ -286,6 +285,24 @@ NetNet* PEBinary::elaborate_net_bit_(Design*des, NetScope*scope,
return 0;
}
/* The types match here and real is not supported. */
if (lsig->data_type() == IVL_VT_REAL) {
char *type;
switch (op_) {
case '^': type = "^"; break; // XOR
case 'X': type = "~^"; break; // XNOR
case '&': type = "&"; break; // AND
case 'A': type = "~&"; break; // NAND (~&)
case '|': type = "|"; break; // Bitwise OR
case 'O': type = "~|"; break; // Bitwise NOR
default: assert(0);
}
cerr << get_fileline() << ": error: " << type
<< " operator may not have REAL operands." << endl;
des->errors += 1;
return 0;
}
if (lsig->vector_width() != rsig->vector_width()) {
cerr << get_fileline() << ": internal error: lsig width ("
<< lsig->vector_width() << ") != rsig pin width ("
@ -765,6 +782,7 @@ NetNet* PEBinary::elaborate_net_div_(Design*des, NetScope*scope,
<< lsig->data_type() << ", right argument is "
<< rsig->data_type() << "." << endl;
des->errors += 1;
return 0;
}
// Create a device with the calculated dimensions.
@ -826,6 +844,7 @@ NetNet* PEBinary::elaborate_net_mod_(Design*des, NetScope*scope,
<< lsig->data_type() << ", right argument is "
<< rsig->data_type() << "." << endl;
des->errors += 1;
return 0;
}
/* The % operator does not support real arguments in baseline
@ -834,6 +853,7 @@ NetNet* PEBinary::elaborate_net_mod_(Design*des, NetScope*scope,
cerr << get_fileline() << ": error: Modulus operator may not "
"have REAL operands." << endl;
des->errors += 1;
return 0;
}
/* rwidth is result width. */
@ -1040,6 +1060,7 @@ NetNet* PEBinary::elaborate_net_mul_(Design*des, NetScope*scope,
<< lsig->data_type() << ", right argument is "
<< rsig->data_type() << "." << endl;
des->errors += 1;
return 0;
}
// The mult is signed if both its operands are signed.
@ -1105,12 +1126,14 @@ NetNet* PEBinary::elaborate_net_pow_(Design*des, NetScope*scope,
<< lsig->data_type() << ", right argument is "
<< rsig->data_type() << "." << endl;
des->errors += 1;
return 0;
}
/* For now we only support real values. */
if (lsig->data_type() != IVL_VT_REAL) {
cerr << get_fileline() << ": sorry: Bit based power (**) is "
<< "currently unsupported in continuous assignments." << endl;
des->errors += 1;
return 0;
}
@ -1166,6 +1189,14 @@ NetNet* PEBinary::elaborate_net_shift_(Design*des, NetScope*scope,
NetNet*lsig = left_->elaborate_net(des, scope, lwidth, 0, 0, 0);
if (lsig == 0) return 0;
/* Cannot shift a real value. */
if (lsig->data_type() == IVL_VT_REAL) {
cerr << get_fileline() << ": error: shift operators "
"cannot shift a real value." << endl;
des->errors += 1;
return 0;
}
if (lsig->vector_width() > lwidth)
lwidth = lsig->vector_width();
@ -1325,6 +1356,14 @@ NetNet* PEBinary::elaborate_net_shift_(Design*des, NetScope*scope,
NetNet*rsig = right_->elaborate_net(des, scope, dwid, 0, 0, 0);
if (rsig == 0) return 0;
/* You cannot shift a value by a real amount. */
if (rsig->data_type() == IVL_VT_REAL) {
cerr << get_fileline() << ": error: shift operators "
"cannot shift by a real value." << endl;
des->errors += 1;
return 0;
}
// Make the shift device itself, and the output
// NetNet. Connect the Result output pins to the osig signal
NetCLShift*gate = new NetCLShift(scope, scope->local_symbol(),
@ -3503,6 +3542,8 @@ NetNet* PEUnary::elab_net_unary_real_(Design*des, NetScope*scope,
sig->local_flag(true);
sig->set_line(*this);
char *type=0;
switch (op_) {
default:
@ -3510,6 +3551,16 @@ NetNet* PEUnary::elab_net_unary_real_(Design*des, NetScope*scope,
<< op_ << " expression with real values." << endl;
des->errors += 1;
break;
case '&': type = "&"; if(0){
case 'A': type = "~&"; }if(0){
case '|': type = "|"; }if(0){
case 'N': type = "~|"; }if(0){
case '^': type = "^"; }if(0){
case 'X': type = "~^"; }
cerr << get_fileline() << ": error: " << type
<< " reduction operator may not have a REAL operand." << endl;
des->errors += 1;
break;
case '!':
cerr << get_fileline() << ": sorry: ! is currently unsupported"
" for real values." << endl;