uintp.adb, [...]: Minor reformatting.

2010-06-22  Robert Dewar  <dewar@adacore.com>

	* uintp.adb, osint.adb, prj-conf.adb, prj-part.adb, prj.adb: Minor
	reformatting.
	* s-taprop-vxworks.adb: Add comment for Set_Priority.
	* impunit.adb (Map_Array): Add entries for s-htable.ads and s-crc32.ads
	* projects.texi: Move @cindex to the left margin, since otherwise we
	are missing entries in the index.

From-SVN: r161179

gcc/ada/ChangeLog

+2010-06-22  Robert Dewar  <dewar@adacore.com>
+
+	* uintp.adb, osint.adb, prj-conf.adb, prj-part.adb, prj.adb: Minor
+	reformatting.
+	* s-taprop-vxworks.adb: Add comment for Set_Priority.
+	* impunit.adb (Map_Array): Add entries for s-htable.ads and s-crc32.ads
+	* projects.texi: Move @cindex to the left margin, since otherwise we
+	are missing entries in the index.
+
 2010-06-22  Emmanuel Briot  <briot@adacore.com>
 
 	* prj-part.adb, prj.adb, tempdir.ads, makeutl.adb: Use

gcc/ada/impunit.adb

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---           Copyright (C) 2000-2009, Free Software Foundation, Inc.        --
+--           Copyright (C) 2000-2010, 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- --
@@ -494,6 +494,8 @@ package body Impunit is
    --  Array of alternative unit names
 
    Scasuti : aliased String := "GNAT.Case_Util";
+   Scrc32  : aliased String := "GNAT.CRC32";
+   Shtable : aliased String := "GNAT.HTable";
    Sos_lib : aliased String := "GNAT.OS_Lib";
    Sregexp : aliased String := "GNAT.Regexp";
    Sregpat : aliased String := "GNAT.Regpat";
@@ -504,8 +506,10 @@ package body Impunit is
 
    --  Array giving mapping
 
-   Map_Array : constant array (1 .. 8) of Aunit_Record := (
+   Map_Array : constant array (1 .. 10) of Aunit_Record := (
                  ("casuti", Scasuti'Access),
+                 ("crc32 ", Scrc32 'Access),
+                 ("htable", Shtable'Access),
                  ("os_lib", Sos_lib'Access),
                  ("regexp", Sregexp'Access),
                  ("regpat", Sregpat'Access),
@@ -609,12 +613,17 @@ package body Impunit is
 
       Get_Name_String (Fname);
 
-      if Name_Len = 12
+      if Name_Len in 11 .. 12
         and then Name_Buffer (1 .. 2) = "s-"
-        and then Name_Buffer (9 .. 12) = ".ads"
+        and then Name_Buffer (Name_Len - 3 .. Name_Len) = ".ads"
       then
          for J in Map_Array'Range loop
-            if Name_Buffer (3 .. 8) = Map_Array (J).Fname then
+            if (Name_Len = 12 and then
+                 Name_Buffer (3 .. 8) = Map_Array (J).Fname)
+              or else
+               (Name_Len = 11 and then
+                 Name_Buffer (3 .. 7) = Map_Array (J).Fname (1 .. 5))
+            then
                Error_Msg_Strlen := Map_Array (J).Aname'Length;
                Error_Msg_String (1 .. Error_Msg_Strlen) :=
                  Map_Array (J).Aname.all;

gcc/ada/osint.adb

@@ -31,14 +31,14 @@ with GNAT.HTable;
 
 with Alloc;
 with Debug;
-with Fmap;             use Fmap;
-with Gnatvsn;          use Gnatvsn;
+with Fmap;     use Fmap;
+with Gnatvsn;  use Gnatvsn;
 with Hostparm;
-with Opt;              use Opt;
-with Output;           use Output;
-with Sdefault;         use Sdefault;
+with Opt;      use Opt;
+with Output;   use Output;
+with Sdefault; use Sdefault;
 with Table;
-with Targparm;         use Targparm;
+with Targparm; use Targparm;
 
 package body Osint is
 

gcc/ada/prj-conf.adb

@@ -23,26 +23,25 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Ada.Directories;  use Ada.Directories;
-with GNAT.HTable;      use GNAT.HTable;
 with Hostparm;
-with Makeutl;          use Makeutl;
+with Makeutl;  use Makeutl;
 with MLib.Tgt;
-with Opt;              use Opt;
-with Output;           use Output;
+with Opt;      use Opt;
+with Output;   use Output;
 with Prj.Env;
 with Prj.Err;
 with Prj.Part;
 with Prj.PP;
-with Prj.Proc;         use Prj.Proc;
-with Prj.Tree;         use Prj.Tree;
-with Prj.Util;         use Prj.Util;
-with Prj;              use Prj;
-with Snames;           use Snames;
-
---  Use GNAT.Case_Util instead of System.Case_Util so that this unit can
---  be used by user code with the "is an internal GNAT Unit" warning
-with GNAT.Case_Util;   use GNAT.Case_Util;
+with Prj.Proc; use Prj.Proc;
+with Prj.Tree; use Prj.Tree;
+with Prj.Util; use Prj.Util;
+with Prj;      use Prj;
+with Snames;   use Snames;
+
+with Ada.Directories; use Ada.Directories;
+
+with GNAT.Case_Util; use GNAT.Case_Util;
+with GNAT.HTable;    use GNAT.HTable;
 
 package body Prj.Conf is
 

gcc/ada/prj-part.adb

@@ -36,8 +36,8 @@ with Sinput.P; use Sinput.P;
 with Snames;
 with Table;
 
-with Ada.Characters.Handling;    use Ada.Characters.Handling;
-with Ada.Exceptions;             use Ada.Exceptions;
+with Ada.Characters.Handling; use Ada.Characters.Handling;
+with Ada.Exceptions;          use Ada.Exceptions;
 
 with GNAT.Directory_Operations; use GNAT.Directory_Operations;
 with GNAT.HTable;               use GNAT.HTable;

gcc/ada/prj.adb

@@ -34,9 +34,8 @@ with Uintp;    use Uintp;
 with Ada.Characters.Handling;    use Ada.Characters.Handling;
 with Ada.Unchecked_Deallocation;
 
+with GNAT.Case_Util;            use GNAT.Case_Util;
 with GNAT.Directory_Operations; use GNAT.Directory_Operations;
-
-with GNAT.Case_Util; use GNAT.Case_Util;
 with GNAT.HTable;
 
 package body Prj is

gcc/ada/s-taprop-vxworks.adb

@@ -745,6 +745,15 @@ package body System.Task_Primitives.Operations is
           (T.Common.LL.Thread, To_VxWorks_Priority (int (Prio)));
       pragma Assert (Result = 0);
 
+      --  Note: in VxWorks, the task is placed at the end of the priority queue
+      --  instead of the head. This is not the behavior required by Annex D,
+      --  but we consider it an acceptable variation (RM 1.1.3(6)), given this
+      --  is the built-in behavior of the operating system.
+
+      --  In older versions we attempted to better approximate the Annex D
+      --  required behavior, but this simulation was not entirely accurate,
+      --  and it seems better to live with the standard VxWorks semantics.
+
       T.Common.Current_Priority := Prio;
    end Set_Priority;
 

gcc/ada/uintp.adb

@@ -1345,9 +1345,11 @@ package body Uintp is
             if not Discard_Quotient then
                Quotient := Uint_0;
             end if;
+
             if not Discard_Remainder then
                Remainder := Left;
             end if;
+
             return;
          end if;
 
@@ -1377,6 +1379,7 @@ package body Uintp is
                if not Discard_Remainder then
                   Remainder := UI_From_Int (Remainder_I);
                end if;
+
                return;
             end;
          end if;