From 76602008b54379c92bebe161cdfc56e2f3b549b1 Mon Sep 17 00:00:00 2001
From: olivier <olivier.coursiere@laposte.net>
Date: Sun, 1 Apr 2012 08:03:12 +0000
Subject: [PATCH] * Updated haiku signal definitions to reflect changes made in
 Haiku   after alpha release 3.

git-svn-id: trunk@20683 -
---
 rtl/haiku/i386/sighnd.inc |  6 ++---
 rtl/haiku/signal.inc      | 47 +++++++++++++++++++++++++++------------
 rtl/haiku/system.pp       |  2 +-
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/rtl/haiku/i386/sighnd.inc b/rtl/haiku/i386/sighnd.inc
index 4f35a18636..811f5aea27 100644
--- a/rtl/haiku/i386/sighnd.inc
+++ b/rtl/haiku/i386/sighnd.inc
@@ -16,7 +16,7 @@
  **********************************************************************}
 
 
-procedure SignalToRunerror(sig : longint; SigContext: PSigContextRec; uContext: Pvregs);public name '_FPC_DEFAULTSIGHANDLER';cdecl;
+procedure SignalToRunerror(sig : longint; SigContext: PSigInfo; uContext: PSigContext);public name '_FPC_DEFAULTSIGHANDLER';cdecl;
 var
   res,fpustate : word;
 begin
@@ -53,10 +53,10 @@ begin
         end;
         SysResetFPU;
       end;
-(*    SIGBUS: {Same as SIGSEGV under BeOS}
+    SIGBUS:
       begin
         res:=214;
-      end; *)
+      end;
     SIGILL:
       begin
       if sse_check then
diff --git a/rtl/haiku/signal.inc b/rtl/haiku/signal.inc
index 071c4f2620..bfc4643854 100644
--- a/rtl/haiku/signal.inc
+++ b/rtl/haiku/signal.inc
@@ -17,7 +17,7 @@ Const   { For sending a signal }
 
   SA_NOCLDSTOP = $01;
   SA_NOCLDWAIT = $02;
-  SA_RESETHAND = $03;
+  SA_RESETHAND = $04;
   SA_NODEFER   = $08;
   SA_RESTART   = $10;
   SA_ONSTACK   = $20;
@@ -78,8 +78,9 @@ Const   { For sending a signal }
   SIGVTALRM  = 27;
   SIGXCPU    = 28;
   SIGXFSZ    = 29;
-  
-  SIGBUS     = SIGSEGV;
+  SIGBUS     = 30;
+  SIGRESERVED1 = 31;
+  SIGRESERVED2 = 32;
   
 {
    Signal numbers 23-32 are currently free but may be used in future
@@ -234,7 +235,9 @@ type
   
   Pvregs = ^vregs;
 
-  sigset_t = array[0..0] of Longint;
+  sigset_t = array[0..1] of Cardinal;
+
+    PSigContext = ^vregs;
 
     PSigContextRec = ^SigContextRec;
     SigContextRec = record
@@ -277,21 +280,37 @@ type
        fpr_ex_sw    : cardinal;
        fpr_pad      : array[0..63] of char;
        end;
+
+  Sigval = Record
+            Case Boolean OF
+        { Members as suggested by Annex C of POSIX 1003.1b. }
+                false : (sigval_int : Longint);
+                True  : (sigval_ptr : Pointer);
+            End;
+
+
+  PSigInfo   = ^SigInfo_t;
+  PSigInfo_t = ^SigInfo_t;
+  SigInfo_t = packed record
+                si_signo,                       { signal number }
+                si_code,                        { signal code }
+                si_errno,                       { errno association }
+                si_pid          : pid_t;      { sending process }
+                si_uid          : uid_t;     { sender's ruid }
+                si_addr         : Pointer;      { faulting instruction }                
+                si_status       : Longint;      { exit value }
+                si_band         : Cardinal;     { band event for SIGPOLL }                
+                si_value        : SigVal;       { signal value }
+                end;
+  TSigInfo = SigInfo_t;
+  TSigInfo_t = TSigInfo;       
        
   SignalHandler   = Procedure(Sig : Longint);cdecl;
   PSignalHandler  = ^SignalHandler;
   SignalRestorer  = Procedure;cdecl;
   PSignalRestorer = ^SignalRestorer;
-  {$WARNING TODO : check with signal.h}
-  { Note: As of R1alpha3, sa_handler still was of SignalHandler type, with one parameter,
-    but the Signal stack has a second parameter that is set to zero
-    and a third that is of type pvregs }
-  sigActionHandler = procedure(Sig: Longint; SigContext: PSigContextRec; uContext : Pvregs);cdecl;
+  sigActionHandler = procedure(Sig: Longint; SigInfo: PSigInfo; uContext : PSigContext);cdecl;
 
-  { Add those type definition to obtain same declaration as for other unix targets 
-    but do not forget the PSigInfo field is currently nil for Haiku as of R1alpha3. }
-  PSigInfo = PSigContextRec;
-  PSigContext = Pvregs;
 
   Sigset=sigset_t;
   TSigset=sigset_t;
@@ -314,7 +333,7 @@ type
 
   {$PACKRECORDS C}
   pstack_t = ^stack_t;
-  stack_t = record
+  stack_t = packed record
     ss_sp: pChar;                       {* signal stack base *}
     ss_size: size_t;                    {* signal stack length *}
     ss_flags: cInt;                     {* SS_DISABLE and/or SS_ONSTACK *}
diff --git a/rtl/haiku/system.pp b/rtl/haiku/system.pp
index cff0ad7eef..6ca4181a2f 100644
--- a/rtl/haiku/system.pp
+++ b/rtl/haiku/system.pp
@@ -322,7 +322,7 @@ end;
 //int		sigaltstack(const stack_t *ss, stack_t *oss);
 
 procedure set_signal_stack(ptr : pointer; size : size_t); cdecl; external 'root' name 'set_signal_stack';
-function sigaltstack(const ss : pstack_t; oss : pstack_t) : integer; cdecl; external 'root' name 'sigaltstack'; 
+function sigaltstack(const stack : pstack_t; oldStack : pstack_t) : integer; cdecl; external 'root' name 'sigaltstack'; 
 
 type
   {$PACKRECORDS C}