* 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, 204 insertions, 18 deletions

diff --git a/gcc/ada/s-tasren.ads b/gcc/ada/s-tasren.ads
index 97c21428b58..7bdeb97bbd7 100644
--- a/gcc/ada/s-tasren.ads
+++ b/gcc/ada/s-tasren.ads
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                  S p e c                                 --
 --                                                                          --
---                             $Revision: 1.26 $                            --
+--                             $Revision$
 --                                                                          --
---          Copyright (C) 1992-1998, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2001, 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- --
@@ -29,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).     --
 --                                                                          --
 ------------------------------------------------------------------------------
 
@@ -44,8 +43,6 @@ with System.Tasking.Protected_Objects.Entries;
 --  used for Protection_Entries
 
 package System.Tasking.Rendezvous is
-   --  This interface is described in the document
-   --  Gnu Ada Runtime Library Interface (GNARLI).
 
    package STPE renames System.Tasking.Protected_Objects.Entries;
 
@@ -55,7 +52,15 @@ package System.Tasking.Rendezvous is
       Uninterpreted_Data    : System.Address;
       Mode                  : Call_Modes;
       Rendezvous_Successful : out Boolean);
-   --  General entry call
+   --  General entry call used to implement ATC or conditional entry calls.
+   --  Compiler interface only. Do not call from within the RTS.
+   --  Acceptor is the ID of the acceptor task.
+   --  E is the entry index requested.
+   --  Uninterpreted_Data represents the parameters of the entry. It is
+   --  constructed by the compiler for the caller and the callee; therefore,
+   --  the run time never needs to decode this data.
+   --  Mode can be either Asynchronous_Call (ATC) or Conditional_Call.
+   --  Rendezvous_Successful is set to True on return if the call was serviced.
 
    procedure Timed_Task_Entry_Call
      (Acceptor              : Task_ID;
@@ -65,33 +70,174 @@ package System.Tasking.Rendezvous is
       Mode                  : Delay_Modes;
       Rendezvous_Successful : out Boolean);
    --  Timed entry call without using ATC.
+   --  Compiler interface only. Do not call from within the RTS.
+   --  See Task_Entry_Call for details on Acceptor, E and Uninterpreted_Data.
+   --  Timeout is the value of the time out.
+   --  Mode determines whether the delay is relative or absolute.
 
    procedure Call_Simple
      (Acceptor           : Task_ID;
       E                  : Task_Entry_Index;
       Uninterpreted_Data : System.Address);
-   --  Simple entry call
+   --  Simple entry call.
+   --  Compiler interface only. Do not call from within the RTS.
+   --
+   --  source:
+   --     T.E1 (Params);
+   --
+   --  expansion:
+   --    declare
+   --       P : parms := (parm1, parm2, parm3);
+   --       X : Task_Entry_Index := 1;
+   --    begin
+   --       Call_Simple (t._task_id, X, P'Address);
+   --       parm1 := P.param1;
+   --       parm2 := P.param2;
+   --       ...
+   --    end;
 
    procedure Cancel_Task_Entry_Call (Cancelled : out Boolean);
-   --  Cancel pending task entry call
+   --  Cancel pending asynchronous task entry call.
+   --  Compiler interface only. Do not call from within the RTS.
+   --  See Exp_Ch9.Expand_N_Asynchronous_Select for code expansion.
 
    procedure Requeue_Task_Entry
      (Acceptor   : Task_ID;
       E          : Task_Entry_Index;
       With_Abort : Boolean);
+   --  Requeue from a task entry to a task entry.
+   --  Compiler interface only. Do not call from within the RTS.
+   --  The code generation for task entry requeues is different from that for
+   --  protected entry requeues. There is a "goto" that skips around the call
+   --  to Complete_Rendezvous, so that Requeue_Task_Entry must also do the work
+   --  of Complete_Rendezvous. The difference is that it does not report that
+   --  the call's State = Done.
+   --
+   --  source:
+   --     accept e1 do
+   --       ...A...
+   --       requeue e2;
+   --       ...B...
+   --     end e1;
+   --
+   --  expansion:
+   --     A62b : address;
+   --     L61b : label
+   --     begin
+   --        accept_call (1, A62b);
+   --        ...A...
+   --        requeue_task_entry (tTV!(t)._task_id, 2, false);
+   --        goto L61b;
+   --        ...B...
+   --        complete_rendezvous;
+   --        <<L61b>>
+   --     exception
+   --        when others =>
+   --           exceptional_complete_rendezvous (current_exception);
+   --     end;
 
    procedure Requeue_Protected_To_Task_Entry
      (Object     : STPE.Protection_Entries_Access;
       Acceptor   : Task_ID;
       E          : Task_Entry_Index;
       With_Abort : Boolean);
+   --  Requeue from a protected entry to a task entry.
+   --  Compiler interface only. Do not call from within the RTS.
+   --
+   --  source:
+   --     entry e2 when b is
+   --     begin
+   --        b := false;
+   --        ...A...
+   --        requeue t.e2;
+   --     end e2;
+   --
+   --  expansion:
+   --     procedure rPT__E14b (O : address; P : address; E :
+   --       protected_entry_index) is
+   --        type rTVP is access rTV;
+   --        freeze rTVP []
+   --        _object : rTVP := rTVP!(O);
+   --     begin
+   --        declare
+   --           rR : protection renames _object._object;
+   --           vP : integer renames _object.v;
+   --           bP : boolean renames _object.b;
+   --        begin
+   --           b := false;
+   --           ...A...
+   --           requeue_protected_to_task_entry (rR'unchecked_access, tTV!(t).
+   --             _task_id, 2, false);
+   --           return;
+   --        end;
+   --        complete_entry_body (_object._object'unchecked_access, objectF =>
+   --          0);
+   --        return;
+   --     exception
+   --        when others =>
+   --           abort_undefer.all;
+   --           exceptional_complete_entry_body (_object._object'
+   --             unchecked_access, current_exception, objectF => 0);
+   --           return;
+   --     end rPT__E14b;
 
    procedure Selective_Wait
      (Open_Accepts       : Accept_List_Access;
       Select_Mode        : Select_Modes;
       Uninterpreted_Data : out System.Address;
       Index              : out Select_Index);
-   --  Selective wait
+   --  Implement select statement.
+   --  Compiler interface only. Do not call from within the RTS.
+   --  See comments on Accept_Call.
+   --
+   --  source:
+   --     select accept e1 do
+   --           ...A...
+   --        end e1;
+   --        ...B...
+   --     or accept e2;
+   --        ...C...
+   --     end select;
+   --
+   --  expansion:
+   --     A32b : address;
+   --     declare
+   --        A37b : T36b;
+   --        A37b (1) := (null_body => false, s => 1);
+   --        A37b (2) := (null_body => true, s => 2);
+   --        S0 : aliased T36b := accept_list'A37b;
+   --        J1 : select_index := 0;
+   --        procedure e1A is
+   --        begin
+   --           abort_undefer.all;
+   --           ...A...
+   --           <<L31b>>
+   --           complete_rendezvous;
+   --        exception
+   --           when all others =>
+   --              exceptional_complete_rendezvous (get_gnat_exception);
+   --        end e1A;
+   --     begin
+   --        selective_wait (S0'unchecked_access, simple_mode, A32b, J1);
+   --        case J1 is
+   --           when 0 =>
+   --              goto L3;
+   --           when 1 =>
+   --              e1A;
+   --              goto L1;
+   --           when 2 =>
+   --              goto L2;
+   --           when others =>
+   --              goto L3;
+   --        end case;
+   --        <<L1>>
+   --        ...B...
+   --        goto L3;
+   --        <<L2>>
+   --        ...C...
+   --        goto L3;
+   --        <<L3>>
+   --     end;
 
    procedure Timed_Selective_Wait
      (Open_Accepts       : Accept_List_Access;
@@ -101,28 +247,67 @@ package System.Tasking.Rendezvous is
       Mode               : Delay_Modes;
       Index              : out Select_Index);
    --  Selective wait with timeout without using ATC.
+   --  Compiler interface only. Do not call from within the RTS.
 
    procedure Accept_Call
      (E                  : Task_Entry_Index;
       Uninterpreted_Data : out System.Address);
-   --  Accept an entry call
+   --  Accept an entry call.
+   --  Compiler interface only. Do not call from within the RTS.
+   --
+   --  source:
+   --              accept E do  ...A... end E;
+   --  expansion:
+   --              A27b : address;
+   --              L26b : label
+   --              begin
+   --                 accept_call (1, A27b);
+   --                 ...A...
+   --                 complete_rendezvous;
+   --              <<L26b>>
+   --              exception
+   --              when all others =>
+   --                 exceptional_complete_rendezvous (get_gnat_exception);
+   --              end;
+   --
+   --  The handler for Abort_Signal (*all* others) is to handle the case when
+   --  the acceptor is aborted between Accept_Call and the corresponding
+   --  Complete_Rendezvous call. We need to wake up the caller in this case.
+   --
+   --   See also Selective_Wait
 
    procedure Accept_Trivial (E : Task_Entry_Index);
-   --  Accept an entry call that has no parameters and no body
+   --  Accept an entry call that has no parameters and no body.
+   --  Compiler interface only. Do not call from within the RTS.
+   --  This should only be called when there is no accept body, or the accept
+   --  body is empty.
+   --
+   --  source:
+   --               accept E;
+   --  expansion:
+   --               accept_trivial (1);
+   --
+   --  The compiler is also able to recognize the following and
+   --  translate it the same way.
+   --
+   --     accept E do null; end E;
 
    function Task_Count (E : Task_Entry_Index) return Natural;
    --  Return number of tasks waiting on the entry E (of current task)
+   --  Compiler interface only. Do not call from within the RTS.
 
    function Callable (T : Task_ID) return Boolean;
-   --  Return T'CALLABLE
+   --  Return T'Callable
+   --  Compiler interface. Do not call from within the RTS, except for body of
+   --  Ada.Task_Identification.
 
    type Task_Entry_Nesting_Depth is new Task_Entry_Index
      range 0 .. Max_Task_Entry;
 
    function Task_Entry_Caller (D : Task_Entry_Nesting_Depth) return Task_ID;
-   --  Return E'Caller.  This will only work if called from within an
-   --  accept statement that is handling E, as required by the
-   --  LRM (C.7.1(14)).
+   --  Return E'Caller. This will only work if called from within an
+   --  accept statement that is handling E, as required by the LRM (C.7.1(14)).
+   --  Compiler interface only. Do not call from within the RTS.
 
    procedure Complete_Rendezvous;
    --  Called by acceptor to wake up caller
@@ -138,13 +323,14 @@ package System.Tasking.Rendezvous is
      (Self_ID    : Task_ID;
       Entry_Call : Entry_Call_Link;
       With_Abort : Boolean) return Boolean;
-   --  Call this only with abort deferred and holding lock of Acceptor.
+   --  Call this only with abort deferred and holding no locks, except
+   --  the global RTS lock when Single_Lock is True which must be owned.
    --  Returns False iff the call cannot be served or queued, as is the
    --  case if the caller is not callable; i.e., a False return value
    --  indicates that Tasking_Error should be raised.
    --  Either initiate the entry call, such that the accepting task is
    --  free to execute the rendezvous, queue the call on the acceptor's
-   --  queue, or cancel the call.  Conditional calls that cannot be
+   --  queue, or cancel the call. Conditional calls that cannot be
    --  accepted immediately are cancelled.
 
 end System.Tasking.Rendezvous;