synth: create build2_concat from netlists-concat.

7 files changed, 48 insertions, 38 deletions

diff --git a/src/synth/netlists-builders.adb b/src/synth/netlists-builders.adb
index 7373ccc0a..7f0a58bde 100644
--- a/src/synth/netlists-builders.adb
+++ b/src/synth/netlists-builders.adb
@@ -992,6 +992,42 @@ package body Netlists.Builders is
       return O;
    end Build_Concatn;
 
+   function Build2_Concat (Ctxt : Context_Acc; Els : Net_Array) return Net
+   is
+      F : constant Int32 := Els'First;
+      Len : constant Natural := Els'Length;
+      Wd : Width;
+      Inst : Instance;
+      N : Net;
+   begin
+      case Len is
+         when 0 =>
+            raise Internal_Error;
+         when 1 =>
+            N := Els (F);
+         when 2 =>
+            N := Build_Concat2 (Ctxt, Els (F + 1), Els (F));
+         when 3 =>
+            N := Build_Concat3 (Ctxt, Els (F + 2), Els (F + 1), Els (F));
+         when 4 =>
+            N := Build_Concat4
+              (Ctxt, Els (F + 3), Els (F + 2), Els (F + 1), Els (F));
+         when 5 .. Natural'Last =>
+            --  Compute length.
+            Wd := 0;
+            for I in Els'Range loop
+               Wd := Wd + Get_Width (Els (I));
+            end loop;
+
+            N := Build_Concatn (Ctxt, Wd, Uns32 (Len));
+            Inst := Get_Net_Parent (N);
+            for I in Els'Range loop
+               Connect (Get_Input (Inst, Port_Idx (Els'Last - I)), Els (I));
+            end loop;
+      end case;
+      return N;
+   end Build2_Concat;
+
    function Build_Trunc
      (Ctxt : Context_Acc; Id : Module_Id; I : Net; W : Width) return Net
    is
diff --git a/src/synth/netlists-builders.ads b/src/synth/netlists-builders.ads
index 2d177653b..63619a306 100644
--- a/src/synth/netlists-builders.ads
+++ b/src/synth/netlists-builders.ads
@@ -114,6 +114,10 @@ package Netlists.Builders is
    function Build_Concatn (Ctxt : Context_Acc; W : Width; Nbr_Inputs : Uns32)
                           return Net;
 
+   --  Concatenate nets of ELS in reverse order.  So if ELS(L .. R), then
+   --  ELS(L) will be at offset 0.
+   function Build2_Concat (Ctxt : Context_Acc; Els : Net_Array) return Net;
+
    function Build_Trunc
      (Ctxt : Context_Acc; Id : Module_Id; I : Net; W : Width) return Net;
    function Build_Extend
diff --git a/src/synth/netlists-concats.adb b/src/synth/netlists-concats.adb
index 4c94fa6ac..0aacd9ec6 100644
--- a/src/synth/netlists-concats.adb
+++ b/src/synth/netlists-concats.adb
@@ -38,49 +38,17 @@ package body Netlists.Concats is
    end Append;
 
    --  Get the concatenation of all nets in C.  Reset C.
-   procedure Build (Ctxt : Context_Acc; C : in out Concat_Type; N : out Net)
-   is
-      Inst : Instance;
-      Wd : Width;
+   procedure Build (Ctxt : Context_Acc; C : in out Concat_Type; N : out Net) is
    begin
       case C.Len is
          when Int32'First .. 0 =>
             raise Internal_Error;
-         when 1 =>
-            N := C.Sarr (1);
-         when 2 =>
-            N := Build_Concat2 (Ctxt, C.Sarr (2), C.Sarr (1));
-         when 3 =>
-            N := Build_Concat3 (Ctxt, C.Sarr (3), C.Sarr (2), C.Sarr (1));
-         when 4 =>
-            N := Build_Concat4
-              (Ctxt, C.Sarr (4), C.Sarr (3), C.Sarr (2), C.Sarr (1));
-         when 5 .. Static_Last =>
-            --  Compute length.
-            Wd := 0;
-            for I in 1 .. C.Len loop
-               Wd := Wd + Get_Width (C.Sarr (I));
-            end loop;
-
-            N := Build_Concatn (Ctxt, Wd, Uns32 (C.Len));
-            Inst := Get_Net_Parent (N);
-            for I in 1 .. C.Len loop
-               Connect (Get_Input (Inst, Port_Idx (C.Len - I)), C.Sarr (I));
-            end loop;
+         when 1 .. Static_Last =>
+            N := Build2_Concat (Ctxt, Net_Array (C.Sarr (1 .. C.Len)));
          when Static_Last + 1 .. Int32'Last =>
             --  Compute length.
             pragma Assert (C.Len = Net_Tables.Last (C.Darr));
-            Wd := 0;
-            for I in 1 .. C.Len loop
-               Wd := Wd + Get_Width (C.Darr.Table (I));
-            end loop;
-
-            N := Build_Concatn (Ctxt, Wd, Uns32 (C.Len));
-            Inst := Get_Net_Parent (N);
-            for I in Net_Tables.First .. C.Len loop
-               Connect (Get_Input (Inst, Port_Idx (C.Len - I)),
-                        C.Darr.Table (I));
-            end loop;
+            N := Build2_Concat (Ctxt, Net_Array (C.Darr.Table (1 .. C.Len)));
             --  Free the vector.
             Net_Tables.Free (C.Darr);
       end case;
diff --git a/src/synth/netlists-utils.ads b/src/synth/netlists-utils.ads
index 10406500d..1026bedc2 100644
--- a/src/synth/netlists-utils.ads
+++ b/src/synth/netlists-utils.ads
@@ -20,7 +20,6 @@
 with Ada.Unchecked_Deallocation;
 
 package Netlists.Utils is
-   type Net_Array is array (Int32 range <>) of Net;
    type Net_Array_Acc is access Net_Array;
    procedure Free_Net_Array is new Ada.Unchecked_Deallocation
      (Net_Array, Net_Array_Acc);
diff --git a/src/synth/netlists.ads b/src/synth/netlists.ads
index 5e1146fb1..b1f562a3a 100644
--- a/src/synth/netlists.ads
+++ b/src/synth/netlists.ads
@@ -112,6 +112,9 @@ package Netlists is
    type Net is private;
    No_Net : constant Net;
 
+   --  So pervasive that it is worth defining this array here.
+   type Net_Array is array (Int32 range <>) of Net;
+
    type Input is private;
    No_Input : constant Input;
 
diff --git a/src/synth/synth-environment.adb b/src/synth/synth-environment.adb
index d5411b4e4..42676f896 100644
--- a/src/synth/synth-environment.adb
+++ b/src/synth/synth-environment.adb
@@ -22,6 +22,7 @@ with Netlists.Builders; use Netlists.Builders;
 with Netlists.Concats;
 with Netlists.Gates;
 with Netlists.Gates_Ports;
+with Netlists.Utils; use Netlists.Utils;
 
 with Errorout; use Errorout;
 
diff --git a/src/synth/synth-environment.ads b/src/synth/synth-environment.ads
index 7b9215128..4b242ab28 100644
--- a/src/synth/synth-environment.ads
+++ b/src/synth/synth-environment.ads
@@ -22,7 +22,6 @@ with Types; use Types;
 with Dyn_Tables;
 with Tables;
 with Netlists; use Netlists;
-with Netlists.Utils; use Netlists.Utils;
 with Netlists.Builders;
 with Synth.Source;