* 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, 15 insertions, 155 deletions

diff --git a/gcc/ada/5zintman.adb b/gcc/ada/5zintman.adb
index 2f58cc2b86f..d49da4dc85c 100644
--- a/gcc/ada/5zintman.adb
+++ b/gcc/ada/5zintman.adb
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                  B o d y                                 --
 --                                                                          --
---                             $Revision: 1.11 $
+--                             $Revision$
 --                                                                          --
---             Copyright (C) 1991-2001 Florida State University             --
+--          Copyright (C) 1992-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- --
@@ -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).     --
 --                                                                          --
 ------------------------------------------------------------------------------
 
@@ -52,42 +51,22 @@
 --  may be used by the thread library.
 
 with Interfaces.C;
---  used for int and other types
-
-with System.Error_Reporting;
-pragma Warnings (Off, System.Error_Reporting);
---  used for Shutdown
 
 with System.OS_Interface;
 --  used for various Constants, Signal and types
 
-with Unchecked_Conversion;
-
 package body System.Interrupt_Management is
 
-   use Interfaces.C;
-   use System.Error_Reporting;
    use System.OS_Interface;
-
-   function To_Isr is new Unchecked_Conversion (Long_Integer, isr_address);
+   use type Interfaces.C.int;
 
    type Interrupt_List is array (Interrupt_ID range <>) of Interrupt_ID;
-   Exception_Interrupts : constant Interrupt_List :=
+   Exception_Interrupts : constant Interrupt_List (1 .. 4) :=
      (SIGFPE, SIGILL, SIGSEGV, SIGBUS);
 
    --  Keep these variables global so that they are initialized only once.
 
    Exception_Action : aliased struct_sigaction;
-   Default_Action : aliased struct_sigaction;
-
-   --  ????? Use these horrible imports here to solve elaboration order
-   --  problems.
-
-   type Task_Id is access all Integer;
-
-   Interrupt_ID_Map : array (Interrupt_ID) of Task_Id;
-   pragma Import (Ada, Interrupt_ID_Map,
-     "system__task_primitives__interrupt_operations__interrupt_id_map");
 
    ----------------------
    -- Notify_Exception --
@@ -99,13 +78,10 @@ package body System.Interrupt_Management is
 
    procedure Notify_Exception (signo : Signal) is
       Mask   : aliased sigset_t;
-      Result : Interfaces.C.int;
-      My_Id  : pthread_t;
+      Result : int;
+      My_Id  : t_id;
+
    begin
-      --  VxWorks will always mask out the signal during the signal
-      --  handler and will reenable it on a longjmp.  GNAT does
-      --  not generate a longjmp to return from a signal handler
-      --  so the signal will still be masked unless we unmask it.
       Result := pthread_sigmask (SIG_SETMASK, null, Mask'Unchecked_Access);
       Result := sigdelset (Mask'Access, signo);
       Result := pthread_sigmask (SIG_SETMASK, Mask'Unchecked_Access, null);
@@ -114,26 +90,11 @@ package body System.Interrupt_Management is
       --  exception.  We take the liberty of resuming the task
       --  for the application.
       My_Id := taskIdSelf;
+
       if taskIsSuspended (My_Id) /= 0 then
          Result := taskResume (My_Id);
       end if;
 
-      --  As long as we are using a longjmp to return control to the
-      --  exception handler on the runtime stack, we are safe. The original
-      --  signal mask (the one we had before coming into this signal catching
-      --  function) will be restored by the longjmp. Therefore, raising
-      --  an exception in this handler should be a safe operation.
-
-      --  Check that treatment of exception propagation here
-      --  is consistent with treatment of the abort signal in
-      --  System.Task_Primitives.Operations.
-
-      --  How can SIGSEGV be split into constraint and storage errors?
-      --  What should SIGILL really raise ? Some implementations have
-      --  codes for different types of SIGILL and some raise Storage_Error.
-      --  What causes SIGBUS and should it be caught?
-      --  Peter Burwood
-
       case signo is
          when SIGFPE =>
             raise Constraint_Error;
@@ -144,63 +105,11 @@ package body System.Interrupt_Management is
          when SIGBUS =>
             raise Program_Error;
          when others =>
-            pragma Assert (Shutdown ("Unexpected signal"));
-            null;
+            --  Unexpected signal
+            raise Program_Error;
       end case;
    end Notify_Exception;
 
-   -------------------
-   -- Notify_Signal --
-   -------------------
-
-   --  VxWorks needs a special casing here. Each VxWorks task has a completely
-   --  separate signal handling, so the usual signal masking can't work.
-   --  This idea is to handle all the signals in all the tasks, and when
-   --  such a signal occurs, redirect it to the dedicated task (if any) or
-   --  reraise it.
-
-   procedure Notify_Signal (signo : Signal);
-
-   procedure Notify_Signal (signo : Signal) is
-      Mask    : aliased sigset_t;
-      Result  : Interfaces.C.int;
-      My_Id   : pthread_t;
-      old_isr : isr_address;
-
-      function Get_Thread_Id (T : Task_Id) return pthread_t;
-      pragma Import (Ada, Get_Thread_Id,
-        "system__task_primitives__operations__get_thread_id");
-
-   begin
-      --  VxWorks will always mask out the signal during the signal
-      --  handler and will reenable it on a longjmp.  GNAT does
-      --  not generate a longjmp to return from a signal handler
-      --  so the signal will still be masked unless we unmask it.
-      Result := pthread_sigmask (SIG_SETMASK, null, Mask'Unchecked_Access);
-      Result := sigdelset (Mask'Access, signo);
-      Result := pthread_sigmask (SIG_SETMASK, Mask'Unchecked_Access, null);
-
-      --  VxWorks will suspend the task when it gets a hardware
-      --  exception.  We take the liberty of resuming the task
-      --  for the application.
-      My_Id := taskIdSelf;
-      if taskIsSuspended (My_Id) /= 0 then
-         Result := taskResume (My_Id);
-      end if;
-
-      --  ??? Need a lock around this, in case the handler is detached
-      --  between the two following statements.
-
-      if Interrupt_ID_Map (Interrupt_ID (signo)) /= null then
-         Result :=
-           kill (Get_Thread_Id (Interrupt_ID_Map (Interrupt_ID (signo))),
-             Signal (signo));
-      else
-         old_isr := c_signal (signo, To_Isr (SIG_DFL));
-         Result := kill (My_Id, Signal (signo));
-      end if;
-   end Notify_Signal;
-
    ---------------------------
    -- Initialize_Interrupts --
    ---------------------------
@@ -209,20 +118,11 @@ package body System.Interrupt_Management is
    --  to initialize signal handling in each task.
 
    procedure Initialize_Interrupts is
+      Result  : int;
       old_act : aliased struct_sigaction;
-      Result  : Interfaces.C.int;
 
    begin
-      for J in Interrupt_ID'First + 1 .. Interrupt_ID'Last loop
-         if J /= Abort_Task_Interrupt then
-            Result := sigaction (Signal (J), Default_Action'Access,
-              old_act'Unchecked_Access);
-            pragma Assert (Result = 0);
-         end if;
-      end loop;
-
       for J in Exception_Interrupts'Range loop
-         Keep_Unmasked (Exception_Interrupts (J)) := True;
          Result :=
            sigaction
              (Signal (Exception_Interrupts (J)), Exception_Action'Access,
@@ -233,63 +133,23 @@ package body System.Interrupt_Management is
 
 begin
    declare
-      mask         : aliased sigset_t;
-      default_mask : aliased sigset_t;
-      Result       : Interfaces.C.int;
-
+      mask   : aliased sigset_t;
+      Result : int;
    begin
-      --  The VxWorks POSIX threads library currently needs initialization.
-      --  We wish it could be in System.OS_Interface, but that would
-      --  cause an elaboration problem.
-
-      pthread_init;
-
       Abort_Task_Interrupt := SIGABRT;
       --  Change this if you want to use another signal for task abort.
       --  SIGTERM might be a good one.
 
       Exception_Action.sa_handler := Notify_Exception'Address;
-      Default_Action.sa_handler   := Notify_Signal'Address;
-
-      Exception_Action.sa_flags := SA_SIGINFO + SA_ONSTACK;
-      Default_Action.sa_flags := SA_SIGINFO + SA_ONSTACK;
-      --  Send us extra signal information (SA_SIGINFO) on the
-      --  stack (SA_ONSTACK).
-      --  There is no SA_NODEFER in VxWorks.  The signal mask is
-      --  restored after a longjmp so the SA_NODEFER option is
-      --  not needed.  - Dan Eischen
-
+      Exception_Action.sa_flags := SA_ONSTACK;
       Result := sigemptyset (mask'Access);
       pragma Assert (Result = 0);
-      Result := sigemptyset (default_mask'Access);
-      pragma Assert (Result = 0);
-
-      for J in Interrupt_ID'First + 1 .. Interrupt_ID'Last loop
-         Result := sigaddset (default_mask'Access, Signal (J));
-         pragma Assert (Result = 0);
-      end loop;
 
       for J in Exception_Interrupts'Range loop
          Result := sigaddset (mask'Access, Signal (Exception_Interrupts (J)));
          pragma Assert (Result = 0);
-         Result :=
-           sigdelset (default_mask'Access, Signal (Exception_Interrupts (J)));
-         pragma Assert (Result = 0);
       end loop;
 
       Exception_Action.sa_mask := mask;
-      Default_Action.sa_mask := default_mask;
-
-      --  Initialize_Interrupts is called for each task in Enter_Task
-
-      Keep_Unmasked (Abort_Task_Interrupt) := True;
-
-      Reserve := Reserve or Keep_Unmasked or Keep_Masked;
-
-      Reserve (0) := True;
-      --  We do not have Signal 0 in reality. We just use this value
-      --  to identify non-existent signals (see s-intnam.ads). Therefore,
-      --  Signal 0 should not be used in all signal related operations hence
-      --  mark it as reserved.
    end;
 end System.Interrupt_Management;