diff options
Diffstat (limited to 'src/ortho/mcode')
-rw-r--r-- | src/ortho/mcode/binary_file.ads | 7 | ||||
-rw-r--r-- | src/ortho/mcode/ortho_code-consts.adb | 12 | ||||
-rw-r--r-- | src/ortho/mcode/ortho_code-decls.adb | 12 | ||||
-rw-r--r-- | src/ortho/mcode/ortho_code-dwarf.adb | 7 | ||||
-rw-r--r-- | src/ortho/mcode/ortho_code-exprs.adb | 7 | ||||
-rw-r--r-- | src/ortho/mcode/ortho_code-types.adb | 12 | ||||
-rw-r--r-- | src/ortho/mcode/ortho_code-x86-abi.adb | 4 | ||||
-rw-r--r-- | src/ortho/mcode/ortho_ident.adb | 12 |
8 files changed, 32 insertions, 41 deletions
diff --git a/src/ortho/mcode/binary_file.ads b/src/ortho/mcode/binary_file.ads index 4618aeb..da8341b 100644 --- a/src/ortho/mcode/binary_file.ads +++ b/src/ortho/mcode/binary_file.ads @@ -19,7 +19,7 @@ with System; with Interfaces; use Interfaces; with Ada.Unchecked_Deallocation; with Ortho_Ident; use Ortho_Ident; -with GNAT.Table; +with Tables; with Memsegs; package Binary_File is @@ -250,12 +250,11 @@ private Section_Chain : Section_Acc := null; Section_Last : Section_Acc := null; - package Symbols is new GNAT.Table + package Symbols is new Tables (Table_Component_Type => Symbol_Type, Table_Index_Type => Symbol, Table_Low_Bound => 2, - Table_Initial => 1024, - Table_Increment => 100); + Table_Initial => 1024); function Pow_Align (V : Pc_Type; Align : Natural) return Pc_Type; diff --git a/src/ortho/mcode/ortho_code-consts.adb b/src/ortho/mcode/ortho_code-consts.adb index d09a13c..6e36a07 100644 --- a/src/ortho/mcode/ortho_code-consts.adb +++ b/src/ortho/mcode/ortho_code-consts.adb @@ -16,7 +16,7 @@ -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. with Ada.Unchecked_Conversion; -with GNAT.Table; +with Tables; with Ada.Text_IO; with Ortho_Code.Types; use Ortho_Code.Types; with Ortho_Code.Debug; @@ -77,12 +77,11 @@ package body Ortho_Code.Consts is end record; for Cnode_Union'Size use 64; - package Cnodes is new GNAT.Table + package Cnodes is new Tables (Table_Component_Type => Cnode_Common, Table_Index_Type => O_Cnode, Table_Low_Bound => 2, - Table_Initial => 128, - Table_Increment => 100); + Table_Initial => 128); function Get_Const_Kind (Cst : O_Cnode) return OC_Kind is begin @@ -315,12 +314,11 @@ package body Ortho_Code.Consts is return L + 2; end Get_Lit_Chain; - package Els is new GNAT.Table + package Els is new Tables (Table_Component_Type => O_Cnode, Table_Index_Type => Int32, Table_Low_Bound => 2, - Table_Initial => 128, - Table_Increment => 100); + Table_Initial => 128); function To_Cnode_Common is new Ada.Unchecked_Conversion (Source => Cnode_Aggr, Target => Cnode_Common); diff --git a/src/ortho/mcode/ortho_code-decls.adb b/src/ortho/mcode/ortho_code-decls.adb index 2557204..253ea60 100644 --- a/src/ortho/mcode/ortho_code-decls.adb +++ b/src/ortho/mcode/ortho_code-decls.adb @@ -15,7 +15,7 @@ -- along with GCC; see the file COPYING. If not, write to the Free -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. -with GNAT.Table; +with Tables; with Ada.Text_IO; with Ortho_Ident; with Ortho_Code.Debug; use Ortho_Code.Debug; @@ -103,19 +103,17 @@ package body Ortho_Code.Decls is pragma Pack (Dnode_Common); - package Dnodes is new GNAT.Table + package Dnodes is new Tables (Table_Component_Type => Dnode_Common, Table_Index_Type => O_Dnode, Table_Low_Bound => O_Dnode_First, - Table_Initial => 128, - Table_Increment => 100); + Table_Initial => 128); - package TDnodes is new GNAT.Table + package TDnodes is new Tables (Table_Component_Type => O_Dnode, Table_Index_Type => O_Tnode, Table_Low_Bound => O_Tnode_First, - Table_Initial => 1, - Table_Increment => 100); + Table_Initial => 8); Context : O_Dnode := O_Dnode_Null; diff --git a/src/ortho/mcode/ortho_code-dwarf.adb b/src/ortho/mcode/ortho_code-dwarf.adb index ad67d1f..309c82d 100644 --- a/src/ortho/mcode/ortho_code-dwarf.adb +++ b/src/ortho/mcode/ortho_code-dwarf.adb @@ -16,7 +16,7 @@ -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. with GNAT.Directory_Operations; -with GNAT.Table; +with Tables; with Interfaces; use Interfaces; with Binary_File; use Binary_File; with Dwarf; use Dwarf; @@ -523,12 +523,11 @@ package body Ortho_Code.Dwarf is Abbrev_Enum_Name : Unsigned_32 := 0; Abbrev_Enumerator : Unsigned_32 := 0; - package TOnodes is new GNAT.Table + package TOnodes is new Tables (Table_Component_Type => Pc_Type, Table_Index_Type => O_Tnode, Table_Low_Bound => O_Tnode_First, - Table_Initial => 16, - Table_Increment => 100); + Table_Initial => 16); procedure Emit_Type_Ref (Atype : O_Tnode) is diff --git a/src/ortho/mcode/ortho_code-exprs.adb b/src/ortho/mcode/ortho_code-exprs.adb index 9cfffd1..7d840cb 100644 --- a/src/ortho/mcode/ortho_code-exprs.adb +++ b/src/ortho/mcode/ortho_code-exprs.adb @@ -17,7 +17,7 @@ -- 02111-1307, USA. with Ada.Text_IO; with Ada.Unchecked_Deallocation; -with GNAT.Table; +with Tables; with Ortho_Code.Types; use Ortho_Code.Types; with Ortho_Code.Consts; use Ortho_Code.Consts; with Ortho_Code.Decls; use Ortho_Code.Decls; @@ -48,12 +48,11 @@ package body Ortho_Code.Exprs is for Enode_Common'Size use 4*32; for Enode_Common'Alignment use 4; - package Enodes is new GNAT.Table + package Enodes is new Tables (Table_Component_Type => Enode_Common, Table_Index_Type => O_Enode, Table_Low_Bound => 2, - Table_Initial => 1024, - Table_Increment => 100); + Table_Initial => 1024); function Get_Expr_Kind (Enode : O_Enode) return OE_Kind is begin diff --git a/src/ortho/mcode/ortho_code-types.adb b/src/ortho/mcode/ortho_code-types.adb index e5893aa..439c065 100644 --- a/src/ortho/mcode/ortho_code-types.adb +++ b/src/ortho/mcode/ortho_code-types.adb @@ -17,7 +17,7 @@ -- 02111-1307, USA. with Ada.Text_IO; with Ada.Unchecked_Conversion; -with GNAT.Table; +with Tables; with Ortho_Code.Consts; use Ortho_Code.Consts; with Ortho_Code.Debug; with Ortho_Code.Abi; use Ortho_Code.Abi; @@ -69,12 +69,11 @@ package body Ortho_Code.Types is Lit_True : O_Cnode; end record; - package Tnodes is new GNAT.Table + package Tnodes is new Tables (Table_Component_Type => Tnode_Common, Table_Index_Type => O_Tnode, Table_Low_Bound => O_Tnode_First, - Table_Initial => 128, - Table_Increment => 100); + Table_Initial => 128); type Field_Type is record Parent : O_Tnode; @@ -84,12 +83,11 @@ package body Ortho_Code.Types is Next : O_Fnode; end record; - package Fnodes is new GNAT.Table + package Fnodes is new Tables (Table_Component_Type => Field_Type, Table_Index_Type => O_Fnode, Table_Low_Bound => 2, - Table_Initial => 64, - Table_Increment => 100); + Table_Initial => 64); function Get_Type_Kind (Atype : O_Tnode) return OT_Kind is begin diff --git a/src/ortho/mcode/ortho_code-x86-abi.adb b/src/ortho/mcode/ortho_code-x86-abi.adb index 36072ab..38cfc92 100644 --- a/src/ortho/mcode/ortho_code-x86-abi.adb +++ b/src/ortho/mcode/ortho_code-x86-abi.adb @@ -139,7 +139,9 @@ package body Ortho_Code.X86.Abi is Release (Decls_Mark); Consts.Release (Consts_Mark); Release (Types_Mark); - Dwarf.Release (Dwarf_Mark); + if Flag_Debug = Debug_Dwarf then + Dwarf.Release (Dwarf_Mark); + end if; end if; end if; end Finish_Body; diff --git a/src/ortho/mcode/ortho_ident.adb b/src/ortho/mcode/ortho_ident.adb index 0893b75..9b5a36e 100644 --- a/src/ortho/mcode/ortho_ident.adb +++ b/src/ortho/mcode/ortho_ident.adb @@ -16,22 +16,20 @@ -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. with Ada.Text_IO; -with GNAT.Table; +with Tables; package body Ortho_Ident is - package Ids is new GNAT.Table + package Ids is new Tables (Table_Component_Type => Natural, Table_Index_Type => O_Ident, Table_Low_Bound => 2, - Table_Initial => 128, - Table_Increment => 100); + Table_Initial => 128); - package Strs is new GNAT.Table + package Strs is new Tables (Table_Component_Type => Character, Table_Index_Type => Natural, Table_Low_Bound => 2, - Table_Initial => 128, - Table_Increment => 100); + Table_Initial => 128); function Get_Identifier (Str : String) return O_Ident is |