From f086715060bca513b83f3625b2193466acb1a940 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 26 Sep 2005 13:23:47 +0000
Subject: [PATCH] * exceptions.cc (handle_exceptions): Properly fill out
 si_code.

---
 winsup/cygwin/ChangeLog     |  4 ++++
 winsup/cygwin/exceptions.cc | 27 ++++++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e875d8b7c..433119463 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-26  Christopher Faylor  <cgf@timesys.com>
+
+	* exceptions.cc (handle_exceptions): Properly fill out si_code.
+
 2005-09-25  Christopher Faylor  <cgf@timesys.com>
 
 	* sigproc.cc (wait_sig): Cosmetic change.
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index c51dd0b1a..bc0d31c7f 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -432,47 +432,47 @@ handle_exceptions (EXCEPTION_RECORD *e0, void *frame, CONTEXT *in0, void *)
     case STATUS_FLOAT_INVALID_OPERATION:
     case STATUS_FLOAT_STACK_CHECK:
       si.si_signo = SIGFPE;
-      si.si_sigval.sival_int = FPE_FLTSUB;
+      si.si_code = FPE_FLTSUB;
       break;
     case STATUS_FLOAT_INEXACT_RESULT:
       si.si_signo = SIGFPE;
-      si.si_sigval.sival_int = FPE_FLTRES;
+      si.si_code = FPE_FLTRES;
       break;
     case STATUS_FLOAT_OVERFLOW:
       si.si_signo = SIGFPE;
-      si.si_sigval.sival_int = FPE_FLTOVF;
+      si.si_code = FPE_FLTOVF;
       break;
     case STATUS_FLOAT_UNDERFLOW:
       si.si_signo = SIGFPE;
-      si.si_sigval.sival_int = FPE_FLTUND;
+      si.si_code = FPE_FLTUND;
       break;
     case STATUS_INTEGER_DIVIDE_BY_ZERO:
       si.si_signo = SIGFPE;
-      si.si_sigval.sival_int = FPE_INTDIV;
+      si.si_code = FPE_INTDIV;
       break;
     case STATUS_INTEGER_OVERFLOW:
       si.si_signo = SIGFPE;
-      si.si_sigval.sival_int = FPE_INTOVF;
+      si.si_code = FPE_INTOVF;
       break;
 
     case STATUS_ILLEGAL_INSTRUCTION:
       si.si_signo = SIGILL;
-      si.si_sigval.sival_int = ILL_ILLOPC;
+      si.si_code = ILL_ILLOPC;
       break;
 
     case STATUS_PRIVILEGED_INSTRUCTION:
       si.si_signo = SIGILL;
-      si.si_sigval.sival_int = ILL_PRVOPC;
+      si.si_code = ILL_PRVOPC;
       break;
 
     case STATUS_NONCONTINUABLE_EXCEPTION:
       si.si_signo = SIGILL;
-      si.si_sigval.sival_int = ILL_ILLADR;
+      si.si_code = ILL_ILLADR;
       break;
 
     case STATUS_TIMEOUT:
       si.si_signo = SIGALRM;
-      si.si_sigval.sival_int = 0;
+      si.si_code = 0;
       break;
 
     case STATUS_ACCESS_VIOLATION:
@@ -484,12 +484,12 @@ handle_exceptions (EXCEPTION_RECORD *e0, void *frame, CONTEXT *in0, void *)
     case STATUS_INVALID_DISPOSITION:
     case STATUS_STACK_OVERFLOW:
       si.si_signo = SIGSEGV;
-      si.si_sigval.sival_int = SEGV_MAPERR;
+      si.si_code = SEGV_MAPERR;
       break;
 
     case STATUS_CONTROL_C_EXIT:
       si.si_signo = SIGINT;
-      si.si_sigval.sival_int = 0;
+      si.si_code = 0;
       break;
 
     case STATUS_INVALID_HANDLE:
@@ -569,7 +569,8 @@ handle_exceptions (EXCEPTION_RECORD *e0, void *frame, CONTEXT *in0, void *)
     me.return_from_fault ();
 
   si.si_addr = ebp;
-  si.si_code = SI_KERNEL;
+  if (!si_code)
+    si.si_code = SI_KERNEL;
   si.si_errno = si.si_pid = si.si_uid = 0;
   me.push ((__stack_t) ebp, true);
   sig_send (NULL, si, &me);	// Signal myself