* 41intnam.ads, 42intnam.ads, 4aintnam.ads, 4cintnam.ads,

	4dintnam.ads, 4gintnam.ads, 4hintnam.ads, 4lintnam.ads,
	4mintnam.ads, 4pintnam.ads, 4rintnam.ads, 4sintnam.ads,
	4uintnam.ads, 4vcalend.adb, 4zintnam.ads, 52system.ads,
	5amastop.adb, 5asystem.ads, 5ataprop.adb, 5atpopsp.adb,
	5avxwork.ads, 5bosinte.adb, 5bsystem.ads, 5esystem.ads,
	5fsystem.ads, 5ftaprop.adb, 5ginterr.adb, 5gmastop.adb,
	5gsystem.ads, 5gtaprop.adb, 5gtasinf.adb, 5gtasinf.ads,
	5hparame.ads, 5hsystem.ads, 5htaprop.adb, 5htraceb.adb,
	5itaprop.adb, 5ksystem.ads, 5kvxwork.ads, 5lintman.adb,
	5lsystem.ads, 5mvxwork.ads, 5ninmaop.adb, 5nosinte.ads,
	5ntaprop.adb, 5ointerr.adb, 5omastop.adb, 5oosinte.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5pvxwork.ads,
	5qtaprop.adb, 5sintman.adb, 5ssystem.ads, 5staprop.adb,
	5stpopse.adb, 5svxwork.ads, 5tosinte.ads, 5uintman.adb,
	5vasthan.adb, 5vinmaop.adb, 5vinterr.adb, 5vintman.adb,
	5vmastop.adb, 5vparame.ads, 5vsystem.ads, 5vtaprop.adb,
	5vtpopde.adb, 5wmemory.adb, 5wsystem.ads, 5wtaprop.adb,
	5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb,
	5zosinte.ads, 5zsystem.ads, 5ztaprop.adb, 6vcpp.adb, 6vcstrea.adb,
	7sintman.adb, 7staprop.adb, 7stpopsp.adb, 9drpc.adb,
	Make-lang.in, Makefile.in, a-caldel.adb, a-comlin.ads,
	a-dynpri.adb, a-except.adb, a-except.ads, a-finali.adb,
	a-ncelfu.ads, a-reatim.adb, a-retide.adb, a-stream.ads,
	a-ststio.adb, a-ststio.ads, a-stwifi.adb, a-tags.adb, a-tasatt.adb,
	a-textio.adb, a-tideau.adb, a-tiflau.adb, a-tigeau.adb,
	a-tigeau.ads, a-tiinau.adb, a-timoau.adb, a-witeio.adb,
	a-wtdeau.adb, a-wtenau.adb, a-wtflau.adb, a-wtgeau.adb,
	a-wtgeau.ads, a-wtinau.adb, a-wtmoau.adb, ada-tree.def, ada-tree.h,
	adaint.c, adaint.h, ali-util.adb, ali.adb, ali.ads, atree.adb,
	atree.ads, atree.h, back_end.adb, bcheck.adb, bindgen.adb,
	bindusg.adb, checks.adb, comperr.adb, config-lang.in, csets.adb,
	csets.ads, cstand.adb, cstreams.c, debug.adb, debug.ads, decl.c,
	einfo.adb, einfo.ads, einfo.h, elists.h, errout.adb, errout.ads,
	eval_fat.adb, exp_aggr.adb, exp_attr.adb, exp_ch11.adb,
	exp_ch12.adb, exp_ch13.adb, exp_ch2.adb, exp_ch3.adb, exp_ch3.ads,
	exp_ch4.adb, exp_ch5.adb, exp_ch6.adb, exp_ch7.adb, exp_ch7.ads,
	exp_ch9.adb, exp_ch9.ads, exp_dbug.adb, exp_dbug.ads, exp_disp.ads,
	exp_dist.adb, exp_fixd.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_strm.adb, exp_util.adb, exp_util.ads,
	expander.adb, expect.c, fe.h, fmap.adb, fmap.ads, fname-uf.adb,
	freeze.adb, frontend.adb, g-awk.adb, g-cgideb.adb, g-comlin.adb,
	g-comlin.ads, g-debpoo.adb, g-dirope.adb, g-dirope.ads,
	g-dyntab.adb, g-expect.adb, g-expect.ads, g-io.ads, g-io_aux.adb,
	g-io_aux.ads, g-locfil.adb, g-locfil.ads, g-os_lib.adb,
	g-os_lib.ads, g-regexp.adb, g-regpat.adb, g-socket.adb,
	g-socket.ads, g-spipat.adb, g-table.adb, g-trasym.adb,
	g-trasym.ads, gigi.h, gmem.c, gnat1drv.adb, gnatbind.adb, gnatbl.c,
	gnatchop.adb, gnatcmd.adb, gnatdll.adb, gnatfind.adb, gnatlbr.adb,
	gnatlink.adb, gnatls.adb, gnatmem.adb, gnatprep.adb, gnatvsn.ads,
	gnatxref.adb, hlo.adb, hostparm.ads, i-cobol.adb, i-cpp.adb,
	i-cstrea.ads, i-cstrin.adb, i-pacdec.adb, i-vxwork.ads,
	impunit.adb, init.c, inline.adb, io-aux.c, layout.adb, lib-load.adb,
	lib-util.adb, lib-writ.adb, lib-writ.ads, lib-xref.adb,
	lib-xref.ads, lib.adb, lib.ads, make.adb, makeusg.adb, mdll.adb,
	memroot.adb, misc.c, mlib-tgt.adb, mlib-utl.adb, mlib-utl.ads,
	mlib.adb, namet.adb, namet.ads, namet.h, nlists.h, nmake.adb,
	nmake.ads, nmake.adt, opt.adb, opt.ads, osint.adb, osint.ads,
	output.adb, output.ads, par-ch2.adb, par-ch3.adb, par-ch5.adb,
	par-prag.adb, par-tchk.adb, par-util.adb, par.adb, prj-attr.adb,
	prj-dect.adb, prj-env.adb, prj-env.ads, prj-nmsc.adb, prj-part.adb,
	prj-proc.adb, prj-strt.adb, prj-tree.adb, prj-tree.ads, prj.adb,
	prj.ads, raise.c, raise.h, repinfo.adb, restrict.adb, restrict.ads,
	rident.ads, rtsfind.adb, rtsfind.ads, s-arit64.adb, s-asthan.adb,
	s-atacco.adb, s-atacco.ads, s-auxdec.adb, s-crc32.adb, s-crc32.ads,
	s-direio.adb, s-fatgen.adb, s-fileio.adb, s-finimp.adb,
	s-gloloc.adb, s-gloloc.ads, s-interr.adb, s-mastop.adb,
	s-mastop.ads, s-memory.adb, s-parame.ads, s-parint.adb,
	s-pooglo.adb, s-pooloc.adb, s-rpc.adb, s-secsta.adb, s-sequio.adb,
	s-shasto.adb, s-soflin.adb, s-soflin.ads, s-stache.adb,
	s-taasde.adb, s-taasde.ads, s-tadeca.adb, s-tadeca.ads,
	s-tadert.adb, s-tadert.ads, s-taenca.adb, s-taenca.ads,
	s-taprob.adb, s-taprop.ads, s-tarest.adb, s-tasdeb.adb,
	s-tasini.adb, s-tasini.ads, s-taskin.adb, s-taskin.ads,
	s-tasque.adb, s-tasque.ads, s-tasren.adb, s-tasren.ads,
	s-tassta.adb, s-tasuti.adb, s-tasuti.ads, s-tataat.adb,
	s-tataat.ads, s-tpoben.adb, s-tpoben.ads, s-tpobop.adb,
	s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads,
	s-unstyp.ads, s-widenu.adb, scn-nlit.adb, scn.adb, sem.adb,
	sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb,
	sem_ch10.adb, sem_ch11.adb, sem_ch11.ads, sem_ch12.adb,
	sem_ch13.adb, sem_ch13.ads, sem_ch2.adb, sem_ch3.adb, sem_ch3.ads,
	sem_ch4.adb, sem_ch5.adb, sem_ch6.adb, sem_ch6.ads, sem_ch7.adb,
	sem_ch8.adb, sem_ch8.ads, sem_ch9.adb, sem_disp.adb, sem_dist.adb,
	sem_elab.adb, sem_elim.adb, sem_elim.ads, sem_eval.adb,
	sem_intr.adb, sem_mech.adb, sem_prag.adb, sem_res.adb,
	sem_type.adb, sem_util.adb, sem_util.ads, sem_vfpt.adb,
	sem_warn.adb, sinfo.adb, sinfo.ads, sinfo.h, sinput-l.adb,
	sinput-l.ads, sinput.adb, sinput.ads, snames.adb, snames.ads,
	snames.h, sprint.adb, sprint.ads, stringt.adb, stringt.ads,
	stringt.h, style.adb, switch.adb, switch.ads, sysdep.c, system.ads,
	table.adb, targparm.adb, targparm.ads, targtyps.c, tbuild.adb,
	tbuild.ads, tracebak.c, trans.c, tree_gen.adb, tree_io.adb,
	treepr.adb, treepr.ads, treeprs.ads, treeprs.adt, ttypes.ads,
	types.adb, types.ads, types.h, uintp.ads, urealp.ads, usage.adb,
	utils.c, utils2.c, validsw.adb, xnmake.adb, xr_tabls.adb,
	xr_tabls.ads, xref_lib.adb, xref_lib.ads : Merge in ACT changes.

	* 1ssecsta.adb, 1ssecsta.ads, a-chlat9.ads, a-cwila9.ads,
	g-enblsp.adb, g-md5.adb, g-md5.ads, gnatname.adb, gnatname.ads,
	mkdir.c, osint-b.adb, osint-b.ads, osint-c.adb, osint-c.ads,
	osint-l.adb, osint-l.ads, osint-m.adb, osint-m.ads : New files

	* 3lsoccon.ads, 5qparame.ads, 5qvxwork.ads, 5smastop.adb,
	5zparame.ads, gnatmain.adb, gnatmain.ads, gnatpsys.adb : Removed

	* mdllfile.adb, mdllfile.ads, mdlltool.adb, mdlltool.ads : Renamed
	to mdll-fil.ad[bs] and mdll-util.ad[bs]

	* mdll-fil.adb, mdll-fil.ads, mdll-utl.adb, mdll-utl.ads : Renamed
	from mdllfile.ad[bs] and mdlltool.ad[bs]


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50451 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 105 insertions, 61 deletions

diff --git a/gcc/ada/s-tposen.adb b/gcc/ada/s-tposen.adb
index 7b2005da9b3..27270b2fb41 100644
--- a/gcc/ada/s-tposen.adb
+++ b/gcc/ada/s-tposen.adb
@@ -1,15 +1,14 @@
 ------------------------------------------------------------------------------
 --                                                                          --
---                GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS               --
+--               GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS                --
 --                                                                          --
---     S Y S T E M . T A S K I N G . P R O T E C T E D _ O B J E C T S .    --
---                          S I N G L E _ E N T R Y                         --
+--              SYSTEM.TASKING.PROTECTED_OBJECTS.SINGLE_ENTRY               --
 --                                                                          --
 --                                  B o d y                                 --
 --                                                                          --
 --                             $Revision$
 --                                                                          --
---              Copyright (C) 1998-2001 Ada Core Technologies               --
+--         Copyright (C) 1998-2002, Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNARL 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- --
@@ -30,8 +29,7 @@
 -- covered by the  GNU Public License.                                      --
 --                                                                          --
 -- GNARL was developed by the GNARL team at Florida State University. It is --
--- now maintained by Ada Core Technologies Inc. in cooperation with Florida --
--- State University (http://www.gnat.com).                                  --
+-- now maintained by Ada Core Technologies, Inc. (http://www.gnat.com).     --
 --                                                                          --
 ------------------------------------------------------------------------------
 
@@ -73,14 +71,14 @@ with System.Task_Primitives.Operations;
 with Ada.Exceptions;
 --  used for Exception_Id;
 
-with Unchecked_Conversion;
+with System.Parameters;
+--  used for Single_Lock
 
 package body System.Tasking.Protected_Objects.Single_Entry is
 
    package STPO renames System.Task_Primitives.Operations;
 
-   function To_Address is new
-     Unchecked_Conversion (Protection_Entry_Access, System.Address);
+   use Parameters;
 
    -----------------------
    -- Local Subprograms --
@@ -110,9 +108,7 @@ package body System.Tasking.Protected_Objects.Single_Entry is
    --    The caller is waiting on Entry_Caller_Sleep, in
    --    Wait_For_Completion, or Wait_For_Completion_With_Timeout.
 
-   procedure Wait_For_Completion
-     (Self_ID    : Task_ID;
-      Entry_Call : Entry_Call_Link);
+   procedure Wait_For_Completion (Entry_Call : Entry_Call_Link);
    pragma Inline (Wait_For_Completion);
    --  This procedure suspends the calling task until the specified entry call
    --  has either been completed or cancelled. On exit, the call will not be
@@ -120,13 +116,11 @@ package body System.Tasking.Protected_Objects.Single_Entry is
    --  Call this only when holding Self_ID locked.
 
    procedure Wait_For_Completion_With_Timeout
-     (Self_ID     : Task_ID;
-      Entry_Call  : Entry_Call_Link;
+     (Entry_Call  : Entry_Call_Link;
       Wakeup_Time : Duration;
       Mode        : Delay_Modes);
    --  Same as Wait_For_Completion but it waits for a timeout with the value
    --  specified in Wakeup_Time as well.
-   --  Self_ID will be locked by this procedure.
 
    procedure Check_Exception
      (Self_ID : Task_ID;
@@ -153,6 +147,8 @@ package body System.Tasking.Protected_Objects.Single_Entry is
      (Self_ID    : Task_ID;
       Entry_Call : Entry_Call_Link)
    is
+      pragma Warnings (Off, Self_ID);
+
       procedure Internal_Raise (X : Ada.Exceptions.Exception_Id);
       pragma Import (C, Internal_Raise, "__gnat_raise_with_msg");
 
@@ -178,72 +174,70 @@ package body System.Tasking.Protected_Objects.Single_Entry is
       Caller : constant Task_ID := Entry_Call.Self;
    begin
       Entry_Call.Exception_To_Raise := Program_Error'Identity;
+
+      if Single_Lock then
+         STPO.Lock_RTS;
+      end if;
+
       STPO.Write_Lock (Caller);
       Wakeup_Entry_Caller (Self_Id, Entry_Call, Done);
       STPO.Unlock (Caller);
+
+      if Single_Lock then
+         STPO.Unlock_RTS;
+      end if;
    end Send_Program_Error;
 
    -------------------------
    -- Wait_For_Completion --
    -------------------------
 
-   --  Call this only when holding Self_ID locked
-
-   procedure Wait_For_Completion
-     (Self_ID    : Task_ID;
-      Entry_Call : Entry_Call_Link) is
+   procedure Wait_For_Completion (Entry_Call : Entry_Call_Link) is
+      Self_Id : constant Task_ID := Entry_Call.Self;
    begin
-      pragma Assert (Self_ID = Entry_Call.Self);
-      Self_ID.Common.State := Entry_Caller_Sleep;
-
-      STPO.Sleep (Self_ID, Entry_Caller_Sleep);
-
-      Self_ID.Common.State := Runnable;
+      Self_Id.Common.State := Entry_Caller_Sleep;
+      STPO.Sleep (Self_Id, Entry_Caller_Sleep);
+      Self_Id.Common.State := Runnable;
    end Wait_For_Completion;
 
    --------------------------------------
    -- Wait_For_Completion_With_Timeout --
    --------------------------------------
 
-   --  This routine will lock Self_ID.
-
-   --  This procedure waits for the entry call to
-   --  be served, with a timeout.  It tries to cancel the
-   --  call if the timeout expires before the call is served.
-
-   --  If we wake up from the timed sleep operation here,
-   --  it may be for the following possible reasons:
-
-   --  1) The entry call is done being served.
-   --  2) The timeout has expired (Timedout = True)
-
-   --  Once the timeout has expired we may need to continue to wait if
-   --  the call is already being serviced. In that case, we want to go
-   --  back to sleep, but without any timeout. The variable Timedout is
-   --  used to control this. If the Timedout flag is set, we do not need
-   --  to Sleep with a timeout. We just sleep until we get a wakeup for
-   --  some status change.
-
    procedure Wait_For_Completion_With_Timeout
-     (Self_ID     : Task_ID;
-      Entry_Call  : Entry_Call_Link;
+     (Entry_Call  : Entry_Call_Link;
       Wakeup_Time : Duration;
       Mode        : Delay_Modes)
    is
+      Self_Id  : constant Task_ID := Entry_Call.Self;
       Timedout : Boolean;
       Yielded  : Boolean;
 
       use type Ada.Exceptions.Exception_Id;
 
    begin
-      STPO.Write_Lock (Self_ID);
+      --  This procedure waits for the entry call to be served, with a timeout.
+      --  It tries to cancel the call if the timeout expires before the call is
+      --  served.
+
+      --  If we wake up from the timed sleep operation here, it may be for the
+      --  following possible reasons:
+
+      --  1) The entry call is done being served.
+      --  2) The timeout has expired (Timedout = True)
+
+      --  Once the timeout has expired we may need to continue to wait if the
+      --  call is already being serviced. In that case, we want to go back to
+      --  sleep, but without any timeout. The variable Timedout is used to
+      --  control this. If the Timedout flag is set, we do not need to Sleep
+      --  with a timeout. We just sleep until we get a wakeup for some status
+      --  change.
 
-      pragma Assert (Entry_Call.Self = Self_ID);
       pragma Assert (Entry_Call.Mode = Timed_Call);
-      Self_ID.Common.State := Entry_Caller_Sleep;
+      Self_Id.Common.State := Entry_Caller_Sleep;
 
       STPO.Timed_Sleep
-        (Self_ID, Wakeup_Time, Mode, Entry_Caller_Sleep, Timedout, Yielded);
+        (Self_Id, Wakeup_Time, Mode, Entry_Caller_Sleep, Timedout, Yielded);
 
       if Timedout then
          Entry_Call.State := Cancelled;
@@ -251,8 +245,7 @@ package body System.Tasking.Protected_Objects.Single_Entry is
          Entry_Call.State := Done;
       end if;
 
-      Self_ID.Common.State := Runnable;
-      STPO.Unlock (Self_ID);
+      Self_Id.Common.State := Runnable;
    end Wait_For_Completion_With_Timeout;
 
    -------------------------
@@ -280,7 +273,10 @@ package body System.Tasking.Protected_Objects.Single_Entry is
       Entry_Call : Entry_Call_Link;
       New_State  : Entry_Call_State)
    is
+      pragma Warnings (Off, Self_ID);
+
       Caller : constant Task_ID := Entry_Call.Self;
+
    begin
       pragma Assert (New_State = Done or else New_State = Cancelled);
       pragma Assert
@@ -300,10 +296,12 @@ package body System.Tasking.Protected_Objects.Single_Entry is
    --------------------------------
 
    procedure Complete_Single_Entry_Body (Object : Protection_Entry_Access) is
+      pragma Warnings (Off, Object);
+
    begin
-      --  Nothing needs to be done since
-      --  Object.Call_In_Progress.Exception_To_Raise has already been set to
-      --  Null_Id
+      --  Nothing needs to do (Object.Call_In_Progress.Exception_To_Raise
+      --  has already been set to Null_Id).
+
       null;
    end Complete_Single_Entry_Body;
 
@@ -328,8 +326,7 @@ package body System.Tasking.Protected_Objects.Single_Entry is
       Compiler_Info     : System.Address;
       Entry_Body        : Entry_Body_Access)
    is
-      Init_Priority  : Integer := Ceiling_Priority;
-
+      Init_Priority : Integer := Ceiling_Priority;
    begin
       if Init_Priority = Unspecified_Priority then
          Init_Priority := System.Priority'Last;
@@ -406,16 +403,35 @@ package body System.Tasking.Protected_Objects.Single_Entry is
          Object.Entry_Body.Action
            (Object.Compiler_Info, Entry_Call.Uninterpreted_Data, 1);
          Object.Call_In_Progress := null;
+
+         if Single_Lock then
+            STPO.Lock_RTS;
+         end if;
+
+         STPO.Write_Lock (Entry_Call.Self);
          Wakeup_Entry_Caller (Self_Id, Entry_Call, Done);
+         STPO.Unlock (Entry_Call.Self);
+
+         if Single_Lock then
+            STPO.Unlock_RTS;
+         end if;
 
       elsif Entry_Call.Mode /= Conditional_Call then
          Object.Entry_Queue := Entry_Call;
       else
          --  Conditional_Call
 
+         if Single_Lock then
+            STPO.Lock_RTS;
+         end if;
+
          STPO.Write_Lock (Entry_Call.Self);
          Wakeup_Entry_Caller (Self_Id, Entry_Call, Cancelled);
          STPO.Unlock (Entry_Call.Self);
+
+         if Single_Lock then
+            STPO.Unlock_RTS;
+         end if;
       end if;
 
    exception
@@ -471,9 +487,17 @@ package body System.Tasking.Protected_Objects.Single_Entry is
       pragma Assert (Entry_Call.State /= Cancelled);
 
       if Entry_Call.State /= Done then
+         if Single_Lock then
+            STPO.Lock_RTS;
+         end if;
+
          STPO.Write_Lock (Self_Id);
-         Wait_For_Completion (Self_Id, Entry_Call'Access);
+         Wait_For_Completion (Entry_Call'Access);
          STPO.Unlock (Self_Id);
+
+         if Single_Lock then
+            STPO.Unlock_RTS;
+         end if;
       end if;
 
       Check_Exception (Self_Id, Entry_Call'Access);
@@ -517,9 +541,18 @@ package body System.Tasking.Protected_Objects.Single_Entry is
               (Object.Compiler_Info, Entry_Call.Uninterpreted_Data, 1);
             Object.Call_In_Progress := null;
             Caller := Entry_Call.Self;
+
+            if Single_Lock then
+               STPO.Lock_RTS;
+            end if;
+
             STPO.Write_Lock (Caller);
             Wakeup_Entry_Caller (Self_Id, Entry_Call, Done);
             STPO.Unlock (Caller);
+
+            if Single_Lock then
+               STPO.Unlock_RTS;
+            end if;
          end if;
       end if;
 
@@ -572,8 +605,19 @@ package body System.Tasking.Protected_Objects.Single_Entry is
          return;
       end if;
 
-      Wait_For_Completion_With_Timeout
-        (Self_Id, Entry_Call'Access, Timeout, Mode);
+      if Single_Lock then
+         STPO.Lock_RTS;
+      else
+         STPO.Write_Lock (Self_Id);
+      end if;
+
+      Wait_For_Completion_With_Timeout (Entry_Call'Access, Timeout, Mode);
+
+      if Single_Lock then
+         STPO.Unlock_RTS;
+      else
+         STPO.Unlock (Self_Id);
+      end if;
 
       pragma Assert (Entry_Call.State >= Done);