synth: remove wbound field of bound_type.

7 files changed, 14 insertions, 36 deletions

diff --git a/src/synth/synth-decls.adb b/src/synth/synth-decls.adb
index 26d6f164b..2eb9897d7 100644
--- a/src/synth/synth-decls.adb
+++ b/src/synth/synth-decls.adb
@@ -245,10 +245,9 @@ package body Synth.Decls is
    function Synth_Discrete_Range_Constraint
      (Syn_Inst : Synth_Instance_Acc; Rng : Node) return Discrete_Range_Type
    is
-      W : Width;
       Res : Discrete_Range_Type;
    begin
-      Synth_Discrete_Range (Syn_Inst, Rng, Res, W);
+      Synth_Discrete_Range (Syn_Inst, Rng, Res);
       return Res;
    end Synth_Discrete_Range_Constraint;
 
diff --git a/src/synth/synth-expr.adb b/src/synth/synth-expr.adb
index c8062e707..781bc704d 100644
--- a/src/synth/synth-expr.adb
+++ b/src/synth/synth-expr.adb
@@ -464,11 +464,10 @@ package body Synth.Expr is
                      Ch : constant Node := Get_Choice_Range (Assoc);
                      Rng : Discrete_Range_Type;
                      Val : Value_Acc;
-                     W_Rng : Width;
                      Rng_Len : Width;
                      Off : Iir_Index32;
                   begin
-                     Synth_Discrete_Range (Syn_Inst, Ch, Rng, W_Rng);
+                     Synth_Discrete_Range (Syn_Inst, Ch, Rng);
                      if Get_Element_Type_Flag (Assoc) then
                         Val := Create_Value_Discrete
                           (Rng.Left,
@@ -675,13 +674,11 @@ package body Synth.Expr is
 
    procedure Synth_Discrete_Range (Syn_Inst : Synth_Instance_Acc;
                                    Bound : Node;
-                                   Rng : out Discrete_Range_Type;
-                                   W : out Width) is
+                                   Rng : out Discrete_Range_Type) is
    begin
       case Get_Kind (Bound) is
          when Iir_Kind_Range_Expression =>
             Rng := Synth_Discrete_Range_Expression (Syn_Inst, Bound);
-            W := Discrete_Range_Width (Rng);
          when Iir_Kind_Integer_Subtype_Definition
            | Iir_Kind_Enumeration_Subtype_Definition =>
             if Get_Type_Declarator (Bound) /= Null_Node then
@@ -691,11 +688,10 @@ package body Synth.Expr is
                   --  This is a named subtype, so it has been evaluated.
                   Typ := Get_Value_Type (Syn_Inst, Bound);
                   Rng := Typ.Drange;
-                  W := Typ.W;
                end;
             else
                Synth_Discrete_Range
-                 (Syn_Inst, Get_Range_Constraint (Bound), Rng, W);
+                 (Syn_Inst, Get_Range_Constraint (Bound), Rng);
             end if;
          when Iir_Kind_Range_Array_Attribute =>
             declare
@@ -706,7 +702,6 @@ package body Synth.Expr is
                                            Is_Signed => True,
                                            Left => Int64 (B.Left),
                                            Right => Int64 (B.Right));
-               W := B.Wbounds;
             end;
          when others =>
             Error_Kind ("synth_discrete_range", Bound);
@@ -747,11 +742,9 @@ package body Synth.Expr is
                                      Atype : Node) return Bound_Type
    is
       Rng : Discrete_Range_Type;
-      W : Width;
    begin
-      Synth_Discrete_Range (Syn_Inst, Atype, Rng, W);
+      Synth_Discrete_Range (Syn_Inst, Atype, Rng);
       return (Dir => Rng.Dir,
-              Wbounds => W,
               Left => Int32 (Rng.Left), Right => Int32 (Rng.Right),
               Len => Get_Range_Length (Rng));
    end Synth_Bounds_From_Range;
@@ -1051,8 +1044,10 @@ package body Synth.Expr is
       Idx2 : Net;
       Off : Net;
       Right : Net;
+      Wbounds : Width;
    begin
-      Idx2 := Synth_Resize (Idx_Val, Bnd.Wbounds, Loc);
+      Wbounds := Clog2 (Bnd.Len);
+      Idx2 := Synth_Resize (Idx_Val, Wbounds, Loc);
 
       if Bnd.Right = 0 and then Bnd.Dir = Iir_Downto then
          --  Simple case without adjustments.
@@ -1060,7 +1055,7 @@ package body Synth.Expr is
       end if;
 
       Right := Build_Const_UB32 (Build_Context, To_Uns32 (Bnd.Right),
-                                 Bnd.Wbounds);
+                                 Wbounds);
       Set_Location (Right, Loc);
 
       case Bnd.Dir is
@@ -1362,7 +1357,6 @@ package body Synth.Expr is
          end case;
       end if;
       Res_Bnd := (Dir => Pfx_Bnd.Dir,
-                  Wbounds => Pfx_Bnd.Wbounds,
                   Len => Len,
                   Left => Int32 (L),
                   Right => Int32 (R));
@@ -1397,9 +1391,8 @@ package body Synth.Expr is
          when Iir_Kind_Range_Array_Attribute =>
             declare
                Rng : Discrete_Range_Type;
-               W : Width;
             begin
-               Synth_Discrete_Range (Syn_Inst, Expr, Rng, W);
+               Synth_Discrete_Range (Syn_Inst, Expr, Rng);
                Inp := No_Net;
                Synth_Slice_Const_Suffix (Syn_Inst, Expr,
                                          Name, Pfx_Bnd,
diff --git a/src/synth/synth-expr.ads b/src/synth/synth-expr.ads
index 8fdf5a89c..08936a15a 100644
--- a/src/synth/synth-expr.ads
+++ b/src/synth/synth-expr.ads
@@ -92,8 +92,7 @@ package Synth.Expr is
 
    procedure Synth_Discrete_Range (Syn_Inst : Synth_Instance_Acc;
                                    Bound : Node;
-                                   Rng : out Discrete_Range_Type;
-                                   W : out Width);
+                                   Rng : out Discrete_Range_Type);
 
    procedure Synth_Slice_Suffix (Syn_Inst : Synth_Instance_Acc;
                                  Name : Node;
diff --git a/src/synth/synth-oper.adb b/src/synth/synth-oper.adb
index 471d82979..56bcd1a02 100644
--- a/src/synth/synth-oper.adb
+++ b/src/synth/synth-oper.adb
@@ -148,14 +148,12 @@ package body Synth.Oper is
    is
       Res : Bound_Type;
       Index_Bounds : Discrete_Range_Type;
-      W : Width;
    begin
-      Synth_Discrete_Range (Syn_Inst, Atype, Index_Bounds, W);
+      Synth_Discrete_Range (Syn_Inst, Atype, Index_Bounds);
 
       Res := (Left => Int32 (Index_Bounds.Left),
               Right => 0,
               Dir => Index_Bounds.Dir,
-              Wbounds => W,
               Len => Uns32 (Len));
 
       if Len = 0 then
diff --git a/src/synth/synth-stmts.adb b/src/synth/synth-stmts.adb
index d5917eb42..f2d12adb4 100644
--- a/src/synth/synth-stmts.adb
+++ b/src/synth/synth-stmts.adb
@@ -1095,12 +1095,10 @@ package body Synth.Stmts is
             when Iir_Kind_Choice_By_Range =>
                declare
                   Bnd : Discrete_Range_Type;
-                  W : Width;
-                  pragma Unreferenced (W);
                   Is_In : Boolean;
                begin
                   Synth_Discrete_Range
-                    (C.Inst, Get_Choice_Range (Choice), Bnd, W);
+                    (C.Inst, Get_Choice_Range (Choice), Bnd);
                   case Bnd.Dir is
                      when Iir_To =>
                         Is_In := Sel >= Bnd.Left and Sel <= Bnd.Right;
diff --git a/src/synth/synth-values.adb b/src/synth/synth-values.adb
index 9eb6c324c..70569d6a6 100644
--- a/src/synth/synth-values.adb
+++ b/src/synth/synth-values.adb
@@ -300,12 +300,9 @@ package body Synth.Values is
    end Create_Slice_Type;
 
    function Create_Vec_Type_By_Length (Len : Width; El : Type_Acc)
-                                      return Type_Acc
-   is
-      W : constant Width := Uns32 (Clog2 (Uns64 (Len)));
+                                      return Type_Acc is
    begin
       return Create_Vector_Type ((Dir => Iir_Downto,
-                                  Wbounds => W,
                                   Left => Int32 (Len) - 1,
                                   Right => 0,
                                   Len => Len),
diff --git a/src/synth/synth-values.ads b/src/synth/synth-values.ads
index a9a127ec8..1afe6d0a4 100644
--- a/src/synth/synth-values.ads
+++ b/src/synth/synth-values.ads
@@ -56,12 +56,6 @@ package Synth.Values is
       Left : Int32;
       Right : Int32;
       Len : Width;
-
-      --  Width of bounds.  This is the precision used to compute the
-      --  address.
-      --  If bounds are 1 to 128 (so left = 1, dir = to, right = 128),
-      --  Wbounds = 8.
-      Wbounds : Width;
    end record;
 
    type Bound_Array_Type is array (Iir_Index32 range <>) of Bound_Type;