diff options
| -rw-r--r-- | src/vhdl/simulate/annotations.adb | 7 | ||||
| -rw-r--r-- | src/vhdl/simulate/debugger.adb | 7 | ||||
| -rw-r--r-- | src/vhdl/simulate/elaboration.ads | 28 | ||||
| -rw-r--r-- | src/vhdl/simulate/simulation-ams.adb | 6 | ||||
| -rw-r--r-- | src/vhdl/simulate/simulation-ams.ads | 12 |
5 files changed, 24 insertions, 36 deletions
diff --git a/src/vhdl/simulate/annotations.adb b/src/vhdl/simulate/annotations.adb index a19950d..47aa0e8 100644 --- a/src/vhdl/simulate/annotations.adb +++ b/src/vhdl/simulate/annotations.adb @@ -16,7 +16,7 @@ -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. -with GNAT.Table; +with Tables; with Ada.Text_IO; with Std_Package; with Errorout; use Errorout; @@ -1095,12 +1095,11 @@ package body Annotations is Current_Scope := (Kind => Scope_Kind_None); end Annotate_Configuration_Declaration; - package Info_Node is new GNAT.Table + package Info_Node is new Tables (Table_Component_Type => Sim_Info_Acc, Table_Index_Type => Iir, Table_Low_Bound => 2, - Table_Initial => 1024, - Table_Increment => 100); + Table_Initial => 1024); procedure Annotate_Expand_Table is diff --git a/src/vhdl/simulate/debugger.adb b/src/vhdl/simulate/debugger.adb index 209bffe..e690aed 100644 --- a/src/vhdl/simulate/debugger.adb +++ b/src/vhdl/simulate/debugger.adb @@ -18,7 +18,7 @@ with System; with Ada.Text_IO; use Ada.Text_IO; -with GNAT.Table; +with Tables; with Types; use Types; with Iir_Values; use Iir_Values; with Name_Table; @@ -91,12 +91,11 @@ package body Debugger is Stmt : Iir; end record; - package Breakpoints is new GNAT.Table + package Breakpoints is new Tables (Table_Index_Type => Natural, Table_Component_Type => Breakpoint_Entry, Table_Low_Bound => 1, - Table_Initial => 16, - Table_Increment => 100); + Table_Initial => 16); -- Current execution state, or reason to stop execution (set by the -- last debugger command). diff --git a/src/vhdl/simulate/elaboration.ads b/src/vhdl/simulate/elaboration.ads index 013a7fb..d28751f 100644 --- a/src/vhdl/simulate/elaboration.ads +++ b/src/vhdl/simulate/elaboration.ads @@ -17,7 +17,7 @@ -- 02111-1307, USA. with Ada.Unchecked_Deallocation; -with GNAT.Table; +with Tables; with Iirs; use Iirs; with Iir_Values; use Iir_Values; with Grt.Types; @@ -137,7 +137,6 @@ package Elaboration is type Block_Instance_Acc_Array is array (Instance_Slot_Type range <>) of Block_Instance_Acc; - type Block_Instance_Acc_Array_Acc is access Block_Instance_Acc_Array; type Package_Instances_Array is array (Pkg_Index_Type range <>) of Block_Instance_Acc; @@ -151,12 +150,11 @@ package Elaboration is Time : Iir_Value_Time; end record; - package Disconnection_Table is new GNAT.Table + package Disconnection_Table is new Tables (Table_Component_Type => Disconnection_Entry, Table_Index_Type => Integer, Table_Low_Bound => 0, - Table_Initial => 16, - Table_Increment => 100); + Table_Initial => 16); -- Connections. For each associations (block/component/entry), the -- elaborator adds an entry in that table. @@ -168,12 +166,11 @@ package Elaboration is Assoc : Iir; end record; - package Connect_Table is new GNAT.Table + package Connect_Table is new Tables (Table_Component_Type => Connect_Entry, Table_Index_Type => Integer, Table_Low_Bound => 0, - Table_Initial => 32, - Table_Increment => 100); + Table_Initial => 32); -- Signals. type Signal_Type_Kind is @@ -199,26 +196,23 @@ package Elaboration is end case; end record; - package Signals_Table is new GNAT.Table + package Signals_Table is new Tables (Table_Component_Type => Signal_Entry, Table_Index_Type => Integer, Table_Low_Bound => 0, - Table_Initial => 128, - Table_Increment => 100); + Table_Initial => 128); type Process_Index_Type is new Natural; - package Processes_Table is new GNAT.Table + package Processes_Table is new Tables (Table_Component_Type => Block_Instance_Acc, Table_Index_Type => Process_Index_Type, Table_Low_Bound => 1, - Table_Initial => 128, - Table_Increment => 100); + Table_Initial => 128); - package Protected_Table is new GNAT.Table + package Protected_Table is new Tables (Table_Component_Type => Block_Instance_Acc, Table_Index_Type => Protected_Index_Type, Table_Low_Bound => 1, - Table_Initial => 2, - Table_Increment => 100); + Table_Initial => 2); end Elaboration; diff --git a/src/vhdl/simulate/simulation-ams.adb b/src/vhdl/simulate/simulation-ams.adb index 31dd43e..89e8b8e 100644 --- a/src/vhdl/simulate/simulation-ams.adb +++ b/src/vhdl/simulate/simulation-ams.adb @@ -99,12 +99,11 @@ package body Simulation.AMS is procedure Compute_Dependencies (Idx : Characteristic_Expressions_Index) is - package Quantity_Table is new GNAT.Table + package Quantity_Table is new Tables (Table_Component_Type => Quantity_Index_Type, Table_Index_Type => Natural, Table_Low_Bound => 1, - Table_Initial => 16, - Table_Increment => 100); + Table_Initial => 16); El : Characteristic_Expr renames Characteristic_Expressions.Table (Idx); Res : Quantity_Dependency_Acc := null; @@ -198,4 +197,3 @@ package body Simulation.AMS is end loop; end Create_Tables; end Simulation.AMS; - diff --git a/src/vhdl/simulate/simulation-ams.ads b/src/vhdl/simulate/simulation-ams.ads index 8ca5136..8909cf1 100644 --- a/src/vhdl/simulate/simulation-ams.ads +++ b/src/vhdl/simulate/simulation-ams.ads @@ -16,7 +16,7 @@ -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. -with GNAT.Table; +with Tables; package Simulation.AMS is -- AMS expressions @@ -133,12 +133,11 @@ private Dependencies : Quantity_Dependency_Acc; end record; - package Characteristic_Expressions is new Gnat.Table + package Characteristic_Expressions is new Tables (Table_Index_Type => Characteristic_Expressions_Index, Table_Component_Type => Characteristic_Expr, Table_Low_Bound => 1, - Table_Initial => 128, - Table_Increment => 100); + Table_Initial => 128); type Scalar_Quantity (Kind : Quantity_Kind := Quantity_Reference) is record Value : Ghdl_F64; @@ -156,10 +155,9 @@ private end case; end record; - package Scalar_Quantities is new Gnat.Table + package Scalar_Quantities is new Tables (Table_Index_Type => Quantity_Index_Type, Table_Component_Type => Scalar_Quantity, Table_Low_Bound => 1, - Table_Initial => 128, - Table_Increment => 100); + Table_Initial => 128); end Simulation.AMS; |