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

Fix index out of bounds error message. 

When displaying an index out-of-bounds message, use the index
given in the source code, not the canonical (translated) value.
(cherry picked from commit 37b11e0355)
This commit is contained in:
Stephen Williams 2009-08-06 11:59:34 -07:00
parent f5728c4a39
commit 98c3391acb
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
elab_net.cc
View File

@ -452,6 +452,9 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
unsigned midx = sig->vector_width()-1, lidx = 0; unsigned midx = sig->vector_width()-1, lidx = 0;
// The default word select is the first. // The default word select is the first.
long widx = 0; long widx = 0;
// The widx_val is the word select as entered in the source
// code. It's used for error messages.
long widx_val = 0;
const name_component_t&name_tail = path_.back(); const name_component_t&name_tail = path_.back();
@ -490,8 +493,11 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
return 0; return 0;
} }
long widx_val = tmp->value().as_long(); widx_val = tmp->value().as_long();
if (sig->array_index_is_valid(widx_val))
widx = sig->array_index_to_address(widx_val); widx = sig->array_index_to_address(widx_val);
else
widx = -1;
delete tmp_ex; delete tmp_ex;
if (debug_elaborate) if (debug_elaborate)
@ -557,7 +563,7 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
if (widx < 0 || widx >= (long) sig->pin_count()) { if (widx < 0 || widx >= (long) sig->pin_count()) {
cerr << get_fileline() << ": warning: ignoring out of " cerr << get_fileline() << ": warning: ignoring out of "
"bounds l-value array access " "bounds l-value array access "
<< sig->name() << "[" << widx << "]." << endl; << sig->name() << "[" << widx_val << "]." << endl;
return 0; return 0;
} }