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

vlog95: Keep the scaling for a variable parameter indexed part select 

The select expression scaling needs to be kept for a variable indexed
part select of a parameter since parameters are zero based in 1364-1995.
This commit is contained in:
Cary R 2013-07-05 17:20:36 -07:00
parent e2361fab29
commit 91ad8a72c6
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tgt-vlog95/expr.c
View File

@ -609,11 +609,13 @@ static void emit_expr_packed(ivl_scope_t scope, ivl_expr_t sig_expr,
} }
/* /*
* Emit an indexed part select as a concatenation of bit selects. * Emit an indexed part select as a concatenation of bit selects. Since a
* parameter in 1364-1995 is always zero based the select expression needs
* to keep any scaling that was done by the compiler.
*/ */
static void emit_expr_ips(ivl_scope_t scope, ivl_expr_t sig_expr, static void emit_expr_ips(ivl_scope_t scope, ivl_expr_t sig_expr,
ivl_expr_t sel_expr, ivl_select_type_t sel_type, ivl_expr_t sel_expr, ivl_select_type_t sel_type,
unsigned wid, int msb, int lsb) unsigned wid, int msb, int lsb, unsigned is_param)
{ {
unsigned idx; unsigned idx;
assert(wid > 0); assert(wid > 0);
@ -628,7 +630,7 @@ static void emit_expr_ips(ivl_scope_t scope, ivl_expr_t sig_expr,
} }
fprintf(vlog_out, "{"); fprintf(vlog_out, "{");
if (msb >= lsb) { if (msb >= lsb) {
if (sel_type == IVL_SEL_IDX_DOWN) { if ((sel_type == IVL_SEL_IDX_DOWN) && ! is_param) {
lsb += wid - 1; lsb += wid - 1;
msb += wid - 1; msb += wid - 1;
emit_select_name(scope, sig_expr, wid); emit_select_name(scope, sig_expr, wid);
@ -644,7 +646,8 @@ static void emit_expr_ips(ivl_scope_t scope, ivl_expr_t sig_expr,
} }
fprintf(vlog_out, "}"); fprintf(vlog_out, "}");
} else { } else {
assert(sel_type == IVL_SEL_IDX_UP); assert((sel_type == IVL_SEL_IDX_UP) ||
(is_param && (sel_type == IVL_SEL_IDX_DOWN)));
for (idx = wid - 1; idx > 0; idx -= 1) { for (idx = wid - 1; idx > 0; idx -= 1) {
emit_select_name(scope, sig_expr, wid); emit_select_name(scope, sig_expr, wid);
fprintf(vlog_out, "["); fprintf(vlog_out, "[");
@ -657,7 +660,7 @@ static void emit_expr_ips(ivl_scope_t scope, ivl_expr_t sig_expr,
fprintf(vlog_out, "]}"); fprintf(vlog_out, "]}");
} }
} else { } else {
if (sel_type == IVL_SEL_IDX_UP) { if ((sel_type == IVL_SEL_IDX_UP) && ! is_param) {
lsb -= wid - 1; lsb -= wid - 1;
msb -= wid - 1; msb -= wid - 1;
emit_select_name(scope, sig_expr, wid); emit_select_name(scope, sig_expr, wid);
@ -673,7 +676,8 @@ static void emit_expr_ips(ivl_scope_t scope, ivl_expr_t sig_expr,
} }
fprintf(vlog_out, "}"); fprintf(vlog_out, "}");
} else { } else {
assert(sel_type == IVL_SEL_IDX_DOWN); assert((sel_type == IVL_SEL_IDX_DOWN) ||
(is_param && (sel_type == IVL_SEL_IDX_UP)));
for (idx = wid - 1; idx > 0; idx -= 1) { for (idx = wid - 1; idx > 0; idx -= 1) {
emit_select_name(scope, sig_expr, wid); emit_select_name(scope, sig_expr, wid);
fprintf(vlog_out, "["); fprintf(vlog_out, "[");
@ -804,7 +808,7 @@ static void emit_expr_select(ivl_scope_t scope, ivl_expr_t expr, unsigned wid)
} else { } else {
/* An indexed part select. */ /* An indexed part select. */
emit_expr_ips(scope, sig_expr, sel_expr, sel_type, emit_expr_ips(scope, sig_expr, sel_expr, sel_type,
width, msb, lsb); width, msb, lsb, type == IVL_EX_NUMBER);
} }
} }
} else { } else {