2004-05-17 Steve Kargl <kargls@comcast.net>

[pf3gnuchains/gcc-fork.git] / gcc / ada / table.adb

diff --git a/gcc/ada/table.adb b/gcc/ada/table.adb
index d81bb8c..3f547a3 100644 (file)
--- a/gcc/ada/table.adb
+++ b/gcc/ada/table.adb
@@ -6,8 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                                                                          --
---          Copyright (C) 1992-2001 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2004 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -28,18 +27,21 @@
 -- covered by the  GNU Public License.                                      --
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
--- It is now maintained by Ada Core Technologies Inc (http://www.gnat.com). --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
 --                                                                          --
 ------------------------------------------------------------------------------
 
 with Debug;   use Debug;
-with Opt;
-with Output;        use Output;
-pragma Elaborate_All (Output);
-with System;        use System;
-with Tree_IO;       use Tree_IO;
+with Opt;     use Opt;
+with Output;  use Output;
+with System;  use System;
+with Tree_IO; use Tree_IO;
+
 with System.Memory; use System.Memory;
-with System.Address_To_Access_Conversions;
+
+with Unchecked_Conversion;
+
+pragma Elaborate_All (Output);
 
 package body Table is
    package body Table is
@@ -64,17 +66,15 @@ package body Table is
       --  Return Null_Address if the table length is zero,
       --  Table (First)'Address if not.
 
-      package Table_Conversions is
-         new System.Address_To_Access_Conversions (Big_Table_Type);
-      --  Address and Access conversions for a Table object.
+      pragma Warnings (Off);
+      --  Turn off warnings. The following unchecked conversions are only used
+      --  internally in this package, and cannot never result in any instances
+      --  of improperly aliased pointers for the client of the package.
 
-      function To_Address (Table : Table_Ptr) return Address;
-      pragma Inline (To_Address);
-      --  Returns the Address for the Table object.
+      function To_Address is new Unchecked_Conversion (Table_Ptr, Address);
+      function To_Pointer is new Unchecked_Conversion (Address, Table_Ptr);
 
-      function To_Pointer (Table : Address) return Table_Ptr;
-      pragma Inline (To_Pointer);
-      --  Returns the Access pointer for the Table object.
+      pragma Warnings (On);
 
       ------------
       -- Append --
@@ -124,11 +124,12 @@ package body Table is
       ----------
 
       procedure Init is
-         Old_Length : Int := Length;
+         Old_Length : constant Int := Length;
 
       begin
+         Locked   := False;
          Last_Val := Min - 1;
-         Max      := Min + (Table_Initial * Opt.Table_Factor) - 1;
+         Max      := Min + (Table_Initial * Table_Factor) - 1;
          Length   := Max - Min + 1;
 
          --  If table is same size as before (happens when table is never
@@ -287,25 +288,6 @@ package body Table is
          end if;
       end Set_Last;
 
-      ----------------
-      -- To_Address --
-      ----------------
-
-      function To_Address (Table : Table_Ptr) return Address is
-      begin
-         return Table_Conversions.To_Address
-           (Table_Conversions.Object_Pointer (Table));
-      end To_Address;
-
-      ----------------
-      -- To_Pointer --
-      ----------------
-
-      function To_Pointer (Table : Address) return Table_Ptr is
-      begin
-         return Table_Ptr (Table_Conversions.To_Pointer (Table));
-      end To_Pointer;
-
       ----------------------------
       -- Tree_Get_Table_Address --
       ----------------------------