X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..5eebf7385fedb1517b66b53c28e5aa6bb0a2be50:/bsd/dev/i386/unix_signal.c

diff --git a/bsd/dev/i386/unix_signal.c b/bsd/dev/i386/unix_signal.c
index 2725a3709..efd73bfb3 100644
--- a/bsd/dev/i386/unix_signal.c
+++ b/bsd/dev/i386/unix_signal.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -52,9 +49,11 @@
 
 #define	USER_CS	0x17
 #define	USER_DS	0x1f
+#define USER_CTHREAD 0x27
 
 #define	UDATA_SEL	USER_DS
 #define	UCODE_SEL	USER_CS
+#define UCTHREAD_SEL    USER_CTHREAD
 
 #define	valid_user_code_selector(x)	(TRUE)
 #define	valid_user_data_selector(x)	(TRUE)
@@ -63,6 +62,10 @@
 
 #define	NULL_SEG	0
 
+/* Signal handler flavors supported */
+/* These defns should match the Libc implmn */
+#define UC_TRAD			1
+
 /*
  * Send an interrupt to process.
  *
@@ -95,7 +98,8 @@ sendsig(p, catcher, sig, mask, code)
 	thread_t thread = current_thread();
 	thread_act_t th_act = current_act();
 	struct uthread * ut;
-	struct i386_saved_state * saved_state = get_user_regs(th_act);
+	struct i386_saved_state * saved_state = (struct i386_saved_state *)
+							get_user_regs(th_act);
 	sig_t trampact;
     
 	ut = get_bsdthread_info(th_act);
@@ -116,7 +120,7 @@ sendsig(p, catcher, sig, mask, code)
 	/* Handler should call sigreturn to get out of it */
 	frame.retaddr = 0xffffffff;	
 	frame.catcher = catcher;
-	frame.sigstyle = 1;
+	frame.sigstyle = UC_TRAD;
 	frame.sig = sig;
 
 	if (sig == SIGILL || sig == SIGFPE) {
@@ -179,7 +183,7 @@ sendsig(p, catcher, sig, mask, code)
 	saved_state->ds = UDATA_SEL;
 	saved_state->es = UDATA_SEL;
 	saved_state->fs = NULL_SEG;
-	saved_state->gs = NULL_SEG;
+	saved_state->gs = USER_CTHREAD;
 	return;
 
 bad:
@@ -217,7 +221,8 @@ sigreturn(p, uap, retval)
     thread_t			thread = current_thread();
     thread_act_t		th_act = current_act();
 	int error;
-    struct i386_saved_state*	saved_state = get_user_regs(th_act);	
+    struct i386_saved_state*	saved_state = (struct i386_saved_state*)
+							get_user_regs(th_act);	
 	struct uthread * ut;