xnu-2782.20.48.tar.gz

[apple/xnu.git] / bsd / dev / i386 / unix_signal.c

diff --git a/bsd/dev/i386/unix_signal.c b/bsd/dev/i386/unix_signal.c
index 06ed4172cb8f7d48311855e00a14b02247eb117d..4f31f83e5a7914d19b21bbd014282b6f8691ca95 100644 (file)
--- a/bsd/dev/i386/unix_signal.c
+++ b/bsd/dev/i386/unix_signal.c
@@ -54,12 +54,12 @@
 #include <i386/machine_routines.h>
 #include <i386/seg.h>
 
 #include <i386/machine_routines.h>
 #include <i386/seg.h>
 

-#include <sys/kdebug.h>
+#include <machine/pal_routines.h>

 
 

+#include <sys/kdebug.h>

 #include <sys/sdt.h>
 
 
 #include <sys/sdt.h>
 
 

-

 /* Forward: */
 extern boolean_t machine_exception(int, mach_exception_code_t, 
                mach_exception_subcode_t, int *, mach_exception_subcode_t *);
 /* Forward: */
 extern boolean_t machine_exception(int, mach_exception_code_t, 
                mach_exception_subcode_t, int *, mach_exception_subcode_t *);


@@ -102,9 +102,10 @@ struct sigframe32 {
 
 /*
  * NOTE: Source and target may *NOT* overlap!
 
 /*
  * NOTE: Source and target may *NOT* overlap!

+ * XXX: Unify with bsd/kern/kern_exit.c

  */
 static void
  */
 static void

-siginfo_user_to_user32(user_siginfo_t *in, user32_siginfo_t *out)
+siginfo_user_to_user32_x86(user_siginfo_t *in, user32_siginfo_t *out)

 {
        out->si_signo   = in->si_signo;
        out->si_errno   = in->si_errno;
 {
        out->si_signo   = in->si_signo;
        out->si_errno   = in->si_errno;


@@ -120,7 +121,7 @@ siginfo_user_to_user32(user_siginfo_t *in, user32_siginfo_t *out)
 }
 
 static void
 }
 
 static void

-siginfo_user_to_user64(user_siginfo_t *in, user64_siginfo_t *out)
+siginfo_user_to_user64_x86(user_siginfo_t *in, user64_siginfo_t *out)

 {
        out->si_signo   = in->si_signo;
        out->si_errno   = in->si_errno;
 {
        out->si_signo   = in->si_signo;
        out->si_errno   = in->si_errno;


@@ -521,7 +522,7 @@ sendsig(struct proc *p, user_addr_t ua_catcher, int sig, int mask, __unused uint
                
                bzero((caddr_t)&sinfo64_user64, sizeof(sinfo64_user64));
                          
                
                bzero((caddr_t)&sinfo64_user64, sizeof(sinfo64_user64));
                          

-               siginfo_user_to_user64(&sinfo64,&sinfo64_user64);
+               siginfo_user_to_user64_x86(&sinfo64,&sinfo64_user64);

 
 #if CONFIG_DTRACE
         bzero((caddr_t)&(ut->t_dtrace_siginfo), sizeof(ut->t_dtrace_siginfo));
 
 #if CONFIG_DTRACE
         bzero((caddr_t)&(ut->t_dtrace_siginfo), sizeof(ut->t_dtrace_siginfo));


@@ -560,7 +561,7 @@ sendsig(struct proc *p, user_addr_t ua_catcher, int sig, int mask, __unused uint
 
                bzero((caddr_t)&sinfo32, sizeof(sinfo32));
 
 
                bzero((caddr_t)&sinfo32, sizeof(sinfo32));
 

-               siginfo_user_to_user32(&sinfo64,&sinfo32);
+               siginfo_user_to_user32_x86(&sinfo64,&sinfo32);

 
 #if CONFIG_DTRACE
         bzero((caddr_t)&(ut->t_dtrace_siginfo), sizeof(ut->t_dtrace_siginfo));
 
 #if CONFIG_DTRACE
         bzero((caddr_t)&(ut->t_dtrace_siginfo), sizeof(ut->t_dtrace_siginfo));


@@ -610,6 +611,8 @@ sendsig(struct proc *p, user_addr_t ua_catcher, int sig, int mask, __unused uint
                goto bad;
        ml_fp_setvalid(FALSE);
 
                goto bad;
        ml_fp_setvalid(FALSE);
 

+       /* Tell the PAL layer about the signal */
+       pal_set_signal_delivery( thread );

 
        proc_lock(p);
 
 
        proc_lock(p);