* gcc.dg/tree-ssa/ssa-dse-10.c: Clean up all dse dump files.

[pf3gnuchains/gcc-fork.git] / gcc / ada / s-carun8.adb

diff --git a/gcc/ada/s-carun8.adb b/gcc/ada/s-carun8.adb
index 26a314e..36bd3be 100644 (file)
--- a/gcc/ada/s-carun8.adb
+++ b/gcc/ada/s-carun8.adb
@@ -1,12 +1,12 @@
 ------------------------------------------------------------------------------
 --                                                                          --
---                   GNU ADA RUNTIME LIBRARY COMPONENTS                     --
+--                    GNAT RUN-TIME LIBRARY COMPONENTS                      --
 --                                                                          --
 --       S Y S T E M . C O M P A R E _ A R R A Y _ U N S I G N E D _ 8      --
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---             Copyright (C) 2002 Free Software Foundation, Inc.            --
+--          Copyright (C) 2002-2007, 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- --
@@ -16,8 +16,8 @@
 -- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
 -- for  more details.  You should have  received  a copy of the GNU General --
 -- Public License  distributed with GNAT;  see file COPYING.  If not, write --
--- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
--- MA 02111-1307, USA.                                                      --
+-- to  the  Free Software Foundation,  51  Franklin  Street,  Fifth  Floor, --
+-- Boston, MA 02110-1301, USA.                                              --
 --                                                                          --
 -- As a special exception,  if other files  instantiate  generics from this --
 -- unit, or you link  this unit with other files  to produce an executable, --
@@ -31,7 +31,9 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Unchecked_Conversion;
+with System.Address_Operations; use System.Address_Operations;
+
+with Ada.Unchecked_Conversion;
 
 package body System.Compare_Array_Unsigned_8 is
 
@@ -50,10 +52,10 @@ package body System.Compare_Array_Unsigned_8 is
    --  Array type used to access by bytes
 
    function To_Big_Words is new
-     Unchecked_Conversion (System.Address, Big_Words_Ptr);
+     Ada.Unchecked_Conversion (System.Address, Big_Words_Ptr);
 
    function To_Big_Bytes is new
-     Unchecked_Conversion (System.Address, Big_Bytes_Ptr);
+     Ada.Unchecked_Conversion (System.Address, Big_Bytes_Ptr);
 
    ----------------------
    -- Compare_Array_U8 --
@@ -63,41 +65,42 @@ package body System.Compare_Array_Unsigned_8 is
      (Left      : System.Address;
       Right     : System.Address;
       Left_Len  : Natural;
-      Right_Len : Natural)
-      return      Integer
+      Right_Len : Natural) return Integer
    is
       Compare_Len : constant Natural := Natural'Min (Left_Len, Right_Len);
 
    begin
       --  If operands are non-aligned, or length is too short, go by bytes
 
-      if (((Left or Right) and 2#11#) /= 0) or else Compare_Len < 4 then
+      if (ModA (OrA (Left, Right), 4) /= 0) or else Compare_Len < 4 then
          return Compare_Array_U8_Unaligned (Left, Right, Left_Len, Right_Len);
       end if;
 
       --  Here we can go by words
 
       declare
-         LeftP  : constant Big_Words_Ptr := To_Big_Words (Left);
-         RightP : constant Big_Words_Ptr := To_Big_Words (Right);
-         Clen4  : constant Natural       := Compare_Len / 4 - 1;
-         Clen4F : constant Natural       := Clen4 * 4;
+         LeftP                   : constant Big_Words_Ptr :=
+                                     To_Big_Words (Left);
+         RightP                  : constant Big_Words_Ptr :=
+                                     To_Big_Words (Right);
+         Words_To_Compare        : constant Natural := Compare_Len / 4;
+         Bytes_Compared_As_Words : constant Natural := Words_To_Compare * 4;
 
       begin
-         for J in 0 .. Clen4 loop
+         for J in 0 .. Words_To_Compare - 1 loop
             if LeftP (J) /= RightP (J) then
                return Compare_Array_U8_Unaligned
-                        (Left  + Address (4 * J),
-                         Right + Address (4 * J),
+                        (AddA (Left,  Address (4 * J)),
+                         AddA (Right, Address (4 * J)),
                          4, 4);
             end if;
          end loop;
 
          return Compare_Array_U8_Unaligned
-                  (Left      + Address (Clen4F),
-                   Right     + Address (Clen4F),
-                   Left_Len  - Clen4F,
-                   Right_Len - Clen4F);
+                  (AddA (Left,  Address (Bytes_Compared_As_Words)),
+                   AddA (Right, Address (Bytes_Compared_As_Words)),
+                   Left_Len  - Bytes_Compared_As_Words,
+                   Right_Len - Bytes_Compared_As_Words);
       end;
    end Compare_Array_U8;
 
@@ -109,8 +112,7 @@ package body System.Compare_Array_Unsigned_8 is
      (Left      : System.Address;
       Right     : System.Address;
       Left_Len  : Natural;
-      Right_Len : Natural)
-      return      Integer
+      Right_Len : Natural) return Integer
    is
       Compare_Len : constant Natural := Natural'Min (Left_Len, Right_Len);