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

Correct normalization of base address for bit- and part-selects 

The required bit width for the address calculation should now be
exactly determined in all cases.

The normalization is also considerably simplified.
This commit is contained in:
Dag Lem 2024-03-05 16:13:21 +01:00
parent 25a84d5cfc
commit ff47e6bfbe
1 changed files with 42 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
netmisc.cc
View File

@ -327,61 +327,41 @@ static unsigned num_bits(long arg)
NetExpr *normalize_variable_base(NetExpr *base, long msb, long lsb, NetExpr *normalize_variable_base(NetExpr *base, long msb, long lsb,
unsigned long wid, bool is_up, long soff) unsigned long wid, bool is_up, long soff)
{ {
long offset = lsb; bool msb_lo = msb < lsb;
if (msb < lsb) { // Calculate the canonical offset.
/* Correct the offset if needed. */ long offset = soff;
if (is_up) offset -= wid - 1; if (msb_lo) {
/* Calculate the space needed for the offset. */ // E.g. logic [0:15] up_vect - prepare to calculate offset - base
unsigned min_wid = num_bits(offset); offset += lsb;
if (num_bits(soff) > min_wid) if (is_up) // E.g. up_vect[msb_base_expr +: width_expr]
min_wid = num_bits(soff); offset -= wid - 1;
/* We need enough space for the larger of the offset or the
* base expression. */
if (min_wid < base->expr_width()) min_wid = base->expr_width();
/* Now that we have the minimum needed width increase it by
* one to make room for the normalization calculation. */
min_wid += 2;
/* Pad the base expression to the correct width. */
base = pad_to_width(base, min_wid, *base);
/* If the base expression is unsigned and either the lsb
* is negative or it does not fill the width of the base
* expression then we could generate negative normalized
* values so cast the expression to signed to get the
* math correct. */
if ((lsb < 0 || num_bits(lsb+1) <= base->expr_width()) &&
! base->has_sign()) {
/* We need this extra select to hide the signed
* property from the padding above. It will be
* removed automatically during code generation. */
NetESelect *tmp = new NetESelect(base, 0 , min_wid);
tmp->set_line(*base);
tmp->cast_signed(true);
base = tmp;
}
/* Normalize the expression. */
base = make_sub_expr(offset+soff, base);
} else { } else {
/* Correct the offset if needed. */ // E.g. logic [15:0] down_vect - prepare to calculate offset + base
if (!is_up) offset += wid - 1; offset -= lsb;
/* If the offset is zero then just return the base (index) if (!is_up) // E.g. down_vect[msb_base_expr -: width_expr]
* expression. */ offset -= wid - 1;
if ((soff-offset) == 0) return base; // There is no need to calculate 0 + base.
/* Calculate the space needed for the offset. */ if (offset == 0) return base;
unsigned min_wid = num_bits(-offset); }
if (num_bits(soff) > min_wid)
min_wid = num_bits(soff); // Calculate the space needed for the offset.
/* We need enough space for the larger of the offset or the unsigned off_wid = num_bits(offset);
* base expression. */ // Get the width of the base expression.
if (min_wid < base->expr_width()) min_wid = base->expr_width(); unsigned base_wid = base->expr_width();
/* Now that we have the minimum needed width increase it by
* one to make room for the normalization calculation. */ // If the result could be negative, then we need to do signed math
min_wid += 2; // to get the location value correct.
/* Pad the base expression to the correct width. */ bool add_base_sign = !base->has_sign() && (offset < 0 || (msb_lo && off_wid <= base_wid));
// If base is signed, we must add a sign bit to offset as well.
bool add_off_sign = offset >= 0 && (base->has_sign() || add_base_sign);
// We need enough space for the larger of the offset or the
// base expression, plus an extra bit for arithmetic overflow.
unsigned min_wid = 1 + max(off_wid + add_off_sign, base_wid + add_base_sign);
base = pad_to_width(base, min_wid, *base); base = pad_to_width(base, min_wid, *base);
/* If the offset is greater than zero then we need to do if (add_base_sign) {
* signed math to get the location value correct. */
if (offset > 0 && ! base->has_sign()) {
/* We need this extra select to hide the signed /* We need this extra select to hide the signed
* property from the padding above. It will be * property from the padding above. It will be
* removed automatically during code generation. */ * removed automatically during code generation. */
@ -390,11 +370,9 @@ NetExpr *normalize_variable_base(NetExpr *base, long msb, long lsb,
tmp->cast_signed(true); tmp->cast_signed(true);
base = tmp; base = tmp;
} }
/* Normalize the expression. */
base = make_add_expr(base, soff-offset);
}
return base; // Normalize the expression.
return msb_lo ? make_sub_expr(offset, base) : make_add_expr(base, offset);
} }
NetExpr *normalize_variable_bit_base(const list<long>&indices, NetExpr*base, NetExpr *normalize_variable_bit_base(const list<long>&indices, NetExpr*base,