dyn_tables: move Table_Initial generic to argument of

3 files changed, 8 insertions, 4 deletions

diff --git a/src/synth/netlists-concats.adb b/src/synth/netlists-concats.adb
index d8df7bbc3..f3e3b8223 100644
--- a/src/synth/netlists-concats.adb
+++ b/src/synth/netlists-concats.adb
@@ -32,7 +32,7 @@ package body Netlists.Concats is
       else
          --  Switch to the dynamic array.
          C.Len := C.Len + 1;
-         Net_Tables.Init (C.Darr);
+         Net_Tables.Init (C.Darr, 2 * Static_Last);
          Net_Tables.Set_Last (C.Darr, C.Len);
          C.Darr.Table (C.Sarr'Range) := C.Sarr;
          C.Darr.Table (C.Len) := N;
diff --git a/src/synth/netlists-concats.ads b/src/synth/netlists-concats.ads
index f3994de4e..122a43a38 100644
--- a/src/synth/netlists-concats.ads
+++ b/src/synth/netlists-concats.ads
@@ -30,7 +30,7 @@ package Netlists.Concats is
    --  Get the concatenation of all nets in C.  Reset C.
    procedure Build (Ctxt : Context_Acc; C : in out Concat_Type; N : out Net);
 private
-   Static_Last : constant Int32 := 16;
+   Static_Last : constant := 16;
 
    package Net_Tables renames Netlists.Utils.Net_Tables;
 
diff --git a/src/synth/netlists-utils.ads b/src/synth/netlists-utils.ads
index 029bd496c..b8ccb3e93 100644
--- a/src/synth/netlists-utils.ads
+++ b/src/synth/netlists-utils.ads
@@ -71,6 +71,10 @@ package Netlists.Utils is
    package Net_Tables is new Dyn_Tables
      (Table_Component_Type => Net,
       Table_Index_Type => Int32,
-      Table_Low_Bound => 1,
-      Table_Initial => 32);
+      Table_Low_Bound => 1);
+
+   package Instance_Tables is new Dyn_Tables
+     (Table_Component_Type => Instance,
+      Table_Index_Type => Int32,
+      Table_Low_Bound => 1);
 end Netlists.Utils;