mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-21 15:41:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

2008-04-08 Olivier Hainque <hainque@adacore.com>

Browse Source 
* s-intman-vxworks.ads, s-intman-vxworks.adb
	(Map_And_Raise_Exception): Remove. Was an import of only part of the
	required services already implemented elsewhere.
	(Notify_Exception): Delete body, import __gnat_error_handler instead.
	(Initialize): Add SA_SIGINFO to the sa_flags, to get the sigcontext
	argument passed to the handler, which we need for ZCX propagation
	purposes.

From-SVN: r134016
This commit is contained in:
Olivier Hainque 2008-04-08 08:46:41 +02:00 committed by Arnaud Charlet
parent c54ec67ce7
commit 7f335c645d
2 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gcc/ada/s-intman-vxworks.adb
View File

@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992-2007, Free Software Foundation, Inc. --
-- Copyright (C) 1992-2008, 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- --
@ -49,8 +49,11 @@ package body System.Interrupt_Management is
Exception_Action : aliased struct_sigaction;
-- Keep this variable global so that it is initialized only once
procedure Map_And_Raise_Exception (signo : Signal);
pragma Import (C, Map_And_Raise_Exception, "__gnat_map_signal");
procedure Notify_Exception
(signo : Signal;
siginfo : System.Address;
sigcontext : System.Address);
pragma Import (C, Notify_Exception, "__gnat_error_handler");
-- Map signal to Ada exception and raise it. Different versions
-- of VxWorks need different mappings.
@ -71,28 +74,6 @@ package body System.Interrupt_Management is
-- 's' Interrupt_State pragma set state to System (use "default"
-- system handler)
procedure Notify_Exception (signo : Signal);
-- Identify the Ada exception to be raised using
-- the information when the system received a synchronous signal.
----------------------
-- Notify_Exception --
----------------------
procedure Notify_Exception (signo : Signal) is
Mask : aliased sigset_t;
Result : int;
pragma Unreferenced (Result);
begin
Result := pthread_sigmask (SIG_SETMASK, null, Mask'Access);
Result := sigdelset (Mask'Access, signo);
Result := pthread_sigmask (SIG_SETMASK, Mask'Access, null);
Map_And_Raise_Exception (signo);
end Notify_Exception;
---------------------------
-- Initialize_Interrupts --
---------------------------
@ -118,10 +99,12 @@ package body System.Interrupt_Management is
----------------
Initialized : Boolean := False;
-- Set to True once Initialize is called, further calls have no effect
procedure Initialize is
mask : aliased sigset_t;
Result : int;
begin
if Initialized then
return;
@ -135,7 +118,7 @@ package body System.Interrupt_Management is
Abort_Task_Interrupt := SIGABRT;
Exception_Action.sa_handler := Notify_Exception'Address;
Exception_Action.sa_flags := SA_ONSTACK;
Exception_Action.sa_flags := SA_ONSTACK + SA_SIGINFO;
Result := sigemptyset (mask'Access);
pragma Assert (Result = 0);

6
gcc/ada/s-intman-vxworks.ads
View File

@ -103,9 +103,9 @@ package System.Interrupt_Management is
-- each task.
procedure Initialize;
-- Initialize the various variables defined in this package.
-- This procedure must be called before accessing any object from this
-- package and can be called multiple times.
-- Initialize the various variables defined in this package. This procedure
-- must be called before accessing any object from this package and can be
-- called multiple times (only the first call has any effect).
private
type Interrupt_Mask is new System.OS_Interface.sigset_t;