diff options
| author | Tristan Gingold <tgingold@free.fr> | 2019-11-08 19:29:40 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2019-11-11 20:25:05 +0100 |
| commit | 207b7fb44c667af87c5f8e4ab20652fcaaf1849e (patch) | |
| tree | 6540bf1f8c7448f174770fc664061980f6c18cba | |
| parent | 539dfe3acefd1c4042779c8bb47e1b851ebaa3c6 (diff) | |
| download | ghdl-207b7fb44c667af87c5f8e4ab20652fcaaf1849e.tar.gz ghdl-207b7fb44c667af87c5f8e4ab20652fcaaf1849e.tar.bz2 ghdl-207b7fb44c667af87c5f8e4ab20652fcaaf1849e.zip | |
synth: move net_table to netlists-utils.
| -rw-r--r-- | src/synth/netlists-concats.ads | 8 | ||||
| -rw-r--r-- | src/synth/netlists-utils.ads | 10 | ||||
| -rw-r--r-- | src/synth/synth-environment.ads | 9 |
3 files changed, 14 insertions, 13 deletions
diff --git a/src/synth/netlists-concats.ads b/src/synth/netlists-concats.ads index 7f3e81898..f3994de4e 100644 --- a/src/synth/netlists-concats.ads +++ b/src/synth/netlists-concats.ads @@ -18,7 +18,7 @@ -- Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, -- MA 02110-1301, USA. -with Dyn_Tables; +with Netlists.Utils; with Netlists.Builders; use Netlists.Builders; package Netlists.Concats is @@ -32,11 +32,7 @@ package Netlists.Concats is private Static_Last : constant Int32 := 16; - package Net_Tables is new Dyn_Tables - (Table_Component_Type => Net, - Table_Index_Type => Int32, - Table_Low_Bound => 1, - Table_Initial => Integer (Static_Last * 2)); + package Net_Tables renames Netlists.Utils.Net_Tables; type Concat_Type is limited record Len : Int32 := 0; diff --git a/src/synth/netlists-utils.ads b/src/synth/netlists-utils.ads index 67a06cecd..029bd496c 100644 --- a/src/synth/netlists-utils.ads +++ b/src/synth/netlists-utils.ads @@ -17,8 +17,11 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, -- MA 02110-1301, USA. + with Ada.Unchecked_Deallocation; +with Dyn_Tables; + package Netlists.Utils is type Net_Array_Acc is access Net_Array; procedure Free_Net_Array is new Ada.Unchecked_Deallocation @@ -63,4 +66,11 @@ package Netlists.Utils is procedure Disconnect_And_Free (I : Input); function Clog2 (W : Width) return Width; + + -- Used at many places. + package Net_Tables is new Dyn_Tables + (Table_Component_Type => Net, + Table_Index_Type => Int32, + Table_Low_Bound => 1, + Table_Initial => 32); end Netlists.Utils; diff --git a/src/synth/synth-environment.ads b/src/synth/synth-environment.ads index 4b242ab28..1f4b24711 100644 --- a/src/synth/synth-environment.ads +++ b/src/synth/synth-environment.ads @@ -19,10 +19,11 @@ -- MA 02110-1301, USA. with Types; use Types; -with Dyn_Tables; with Tables; + with Netlists; use Netlists; with Netlists.Builders; + with Synth.Source; package Synth.Environment is @@ -311,10 +312,4 @@ private Table_Index_Type => Conc_Assign, Table_Low_Bound => No_Conc_Assign, Table_Initial => 1024); - - package Net_Tables is new Dyn_Tables - (Table_Component_Type => Net, - Table_Index_Type => Int32, - Table_Low_Bound => 1, - Table_Initial => 32); end Synth.Environment; |