diff options
Diffstat (limited to 'gcc/ada/7sintman.adb')
| -rw-r--r-- | gcc/ada/7sintman.adb | 109 |
1 files changed, 78 insertions, 31 deletions
diff --git a/gcc/ada/7sintman.adb b/gcc/ada/7sintman.adb index ee8acee5d58..72b1cf87380 100644 --- a/gcc/ada/7sintman.adb +++ b/gcc/ada/7sintman.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1991-2002, 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- -- @@ -26,15 +26,12 @@ -- however invalidate any other reasons why the executable file might be -- -- 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). -- +-- GNARL was developed by the GNARL team at Florida State University. -- +-- Extensive contributions were provided by Ada Core Technologies, Inc. -- -- -- ------------------------------------------------------------------------------ --- This is the default version of this package - --- This is a Sun OS (FSU THREADS) version of this package +-- This is the POSIX threads version of this package -- PLEASE DO NOT add any dependences on other packages. ??? why not ??? -- This package is designed to work with or without tasking support. @@ -51,16 +48,16 @@ -- signal handling, create a new s-intman.adb that will fit your needs. -- This file assumes that: --- + -- SIGFPE, SIGILL, SIGSEGV and SIGBUS exist. They are mapped as follows: -- SIGPFE => Constraint_Error -- SIGILL => Program_Error -- SIGSEGV => Storage_Error -- SIGBUS => Storage_Error --- + -- SIGINT exists and will be kept unmasked unless the pragma -- Unreserve_All_Interrupts is specified anywhere in the application. --- + -- System.OS_Interface contains the following: -- SIGADAABORT: the signal that will be used to abort tasks. -- Unmasked: the OS specific set of signals that should be unmasked in @@ -109,7 +106,7 @@ package body System.Interrupt_Management is begin -- With the __builtin_longjmp, the signal mask is not restored, so we - -- need to restore it explicitly. + -- need to restore it explicitely. Result := pthread_sigmask (SIG_UNBLOCK, Signal_Mask'Access, null); pragma Assert (Result = 0); @@ -151,7 +148,22 @@ begin declare act : aliased struct_sigaction; old_act : aliased struct_sigaction; - Result : Interfaces.C.int; + Result : System.OS_Interface.int; + + function State (Int : Interrupt_ID) return Character; + pragma Import (C, State, "__gnat_get_interrupt_state"); + -- Get interrupt state. Defined in a-init.c + -- The input argument is the interrupt number, + -- and the result is one of the following: + + User : constant Character := 'u'; + Runtime : constant Character := 'r'; + Default : constant Character := 's'; + -- 'n' this interrupt not set by any Interrupt_State pragma + -- 'u' Interrupt_State pragma set state to User + -- 'r' Interrupt_State pragma set state to Runtime + -- 's' Interrupt_State pragma set state to System (use "default" + -- system handler) begin -- Need to call pthread_init very early because it is doing signal @@ -174,51 +186,86 @@ begin -- The right fix should be made in sigsetjmp so that we save -- the Signal_Set and restore it after a longjmp. - -- Since SA_NODEFER is obsolete, instead we reset explicitly + -- Since SA_NODEFER is obsolete, instead we reset explicitely -- the mask in the exception handler. Result := sigemptyset (Signal_Mask'Access); pragma Assert (Result = 0); - -- ??? For the same reason explained above, we can't mask these - -- signals because otherwise we won't be able to catch more than - -- one signal. + -- Add signals that map to Ada exceptions to the mask. + for J in Exception_Interrupts'Range loop + if State (Exception_Interrupts (J)) /= Default then + Result := + sigaddset (Signal_Mask'Access, Signal (Exception_Interrupts (J))); + pragma Assert (Result = 0); + end if; + end loop; act.sa_mask := Signal_Mask; - Keep_Unmasked (Abort_Task_Interrupt) := True; + pragma Assert (Keep_Unmasked = (Interrupt_ID'Range => False)); + pragma Assert (Reserve = (Interrupt_ID'Range => False)); + + -- Process state of exception signals + for J in Exception_Interrupts'Range loop + if State (Exception_Interrupts (J)) /= User then + Keep_Unmasked (Exception_Interrupts (J)) := True; + Reserve (Exception_Interrupts (J)) := True; + + if State (Exception_Interrupts (J)) /= Default then + Result := + sigaction + (Signal (Exception_Interrupts (J)), act'Unchecked_Access, + old_act'Unchecked_Access); + pragma Assert (Result = 0); + end if; + end if; + end loop; - -- By keeping SIGINT unmasked, allow the user to do a Ctrl-C, but at - -- the same time, disable the ability of handling this signal via - -- package Ada.Interrupts. + if State (Abort_Task_Interrupt) /= User then + Keep_Unmasked (Abort_Task_Interrupt) := True; + Reserve (Abort_Task_Interrupt) := True; + end if; - -- The pragma Unreserve_All_Interrupts let the user the ability to - -- change this behavior. + -- Set SIGINT to unmasked state as long as it is not in "User" + -- state. Check for Unreserve_All_Interrupts last - if Unreserve_All_Interrupts = 0 then + if State (SIGINT) /= User then Keep_Unmasked (SIGINT) := True; + Reserve (SIGINT) := True; end if; - for J in Exception_Interrupts'Range loop - Keep_Unmasked (Exception_Interrupts (J)) := True; + -- Check all signals for state that requires keeping them + -- unmasked and reserved - Result := - sigaction - (Signal (Exception_Interrupts (J)), act'Unchecked_Access, - old_act'Unchecked_Access); - pragma Assert (Result = 0); + for J in Interrupt_ID'Range loop + if State (J) = Default or else State (J) = Runtime then + Keep_Unmasked (J) := True; + Reserve (J) := True; + end if; end loop; + -- Add the set of signals that must always be unmasked for this target + for J in Unmasked'Range loop Keep_Unmasked (Interrupt_ID (Unmasked (J))) := True; + Reserve (Interrupt_ID (Unmasked (J))) := True; end loop; - Reserve := Keep_Unmasked or Keep_Masked; + -- Add target-specific reserved signals for J in Reserved'Range loop Reserve (Interrupt_ID (Reserved (J))) := True; end loop; + -- Process pragma Unreserve_All_Interrupts. This overrides any + -- settings due to pragma Interrupt_State: + + if Unreserve_All_Interrupts /= 0 then + Keep_Unmasked (SIGINT) := False; + Reserve (SIGINT) := False; + end if; + -- 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 |