xnu-3789.1.32.tar.gz

[apple/xnu.git] / bsd / sys / signal.h

diff --git a/bsd/sys/signal.h b/bsd/sys/signal.h
index 0fa8fb1cb349cb2c9df8f860ffe658006b2d52fd..2483e8db30e4b64b1dcee2bc6fab3a0d881a3991 100644 (file)
--- a/bsd/sys/signal.h
+++ b/bsd/sys/signal.h
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * 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. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*


@@ -65,9 +71,12 @@
 
 #include <sys/cdefs.h>
 #include <sys/appleapiopts.h>
 
 #include <sys/cdefs.h>
 #include <sys/appleapiopts.h>

+#include <Availability.h>
+
+#define __DARWIN_NSIG  32      /* counting 0; could be 33 (mask is 1-32) */

 
 

-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE)
-#define NSIG   32              /* counting 0; could be 33 (mask is 1-32) */
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+#define NSIG   __DARWIN_NSIG

 #endif
 
 #include <machine/signal.h>    /* sigcontext; codes for SIGILL, SIGFPE */
 #endif
 
 #include <machine/signal.h>    /* sigcontext; codes for SIGILL, SIGFPE */


@@ -78,12 +87,12 @@
 #define        SIGILL  4       /* illegal instruction (not reset when caught) */
 #define        SIGTRAP 5       /* trace trap (not reset when caught) */
 #define        SIGABRT 6       /* abort() */
 #define        SIGILL  4       /* illegal instruction (not reset when caught) */
 #define        SIGTRAP 5       /* trace trap (not reset when caught) */
 #define        SIGABRT 6       /* abort() */

-#if  defined(_POSIX_C_SOURCE)
+#if  (defined(_POSIX_C_SOURCE) && !defined(_DARWIN_C_SOURCE))

 #define        SIGPOLL 7       /* pollable event ([XSR] generated, not supported) */
 #define        SIGPOLL 7       /* pollable event ([XSR] generated, not supported) */

-#else  /* !_POSIX_C_SOURCE */
+#else  /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */

 #define        SIGIOT  SIGABRT /* compatibility */
 #define        SIGEMT  7       /* EMT instruction */
 #define        SIGIOT  SIGABRT /* compatibility */
 #define        SIGEMT  7       /* EMT instruction */

-#endif /* !_POSIX_C_SOURCE */
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */

 #define        SIGFPE  8       /* floating point exception */
 #define        SIGKILL 9       /* kill (cannot be caught or ignored) */
 #define        SIGBUS  10      /* bus error */
 #define        SIGFPE  8       /* floating point exception */
 #define        SIGKILL 9       /* kill (cannot be caught or ignored) */
 #define        SIGBUS  10      /* bus error */


@@ -99,21 +108,21 @@
 #define        SIGCHLD 20      /* to parent on child stop or exit */
 #define        SIGTTIN 21      /* to readers pgrp upon background tty read */
 #define        SIGTTOU 22      /* like TTIN for output if (tp->t_local&LTOSTOP) */
 #define        SIGCHLD 20      /* to parent on child stop or exit */
 #define        SIGTTIN 21      /* to readers pgrp upon background tty read */
 #define        SIGTTOU 22      /* like TTIN for output if (tp->t_local&LTOSTOP) */

-#if  !defined(_POSIX_C_SOURCE)
+#if  (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))

 #define        SIGIO   23      /* input/output possible signal */
 #endif
 #define        SIGXCPU 24      /* exceeded CPU time limit */
 #define        SIGXFSZ 25      /* exceeded file size limit */
 #define        SIGVTALRM 26    /* virtual time alarm */
 #define        SIGPROF 27      /* profiling time alarm */
 #define        SIGIO   23      /* input/output possible signal */
 #endif
 #define        SIGXCPU 24      /* exceeded CPU time limit */
 #define        SIGXFSZ 25      /* exceeded file size limit */
 #define        SIGVTALRM 26    /* virtual time alarm */
 #define        SIGPROF 27      /* profiling time alarm */

-#if  !defined(_POSIX_C_SOURCE)
+#if  (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))

 #define SIGWINCH 28    /* window size changes */
 #define SIGINFO        29      /* information request */
 #endif
 #define SIGUSR1 30     /* user defined signal 1 */
 #define SIGUSR2 31     /* user defined signal 2 */
 
 #define SIGWINCH 28    /* window size changes */
 #define SIGINFO        29      /* information request */
 #endif
 #define SIGUSR1 30     /* user defined signal 1 */
 #define SIGUSR2 31     /* user defined signal 2 */
 

-#if defined(_ANSI_SOURCE) || defined(_POSIX_C_SOURCE) || defined(__cplusplus)
+#if defined(_ANSI_SOURCE) || __DARWIN_UNIX03 || defined(__cplusplus)

 /*
  * Language spec sez we must list exactly one parameter, even though we
  * actually supply three.  Ugh!
 /*
  * Language spec sez we must list exactly one parameter, even though we
  * actually supply three.  Ugh!


@@ -134,54 +143,19 @@
 #ifndef _ANSI_SOURCE
 #include <sys/_types.h>
 
 #ifndef _ANSI_SOURCE
 #include <sys/_types.h>
 

-#ifndef _MCONTEXT_T
-#define _MCONTEXT_T
-typedef __darwin_mcontext_t            mcontext_t;
-#endif
-
-#ifndef _POSIX_C_SOURCE
-#ifndef _MCONTEXT64_T
-#define _MCONTEXT64_T
-typedef __darwin_mcontext64_t          mcontext64_t;
-#endif
-#endif /* _POSIX_C_SOURCE */
-
-#ifndef _PID_T
-#define _PID_T
-typedef __darwin_pid_t                 pid_t;
-#endif
-
-#ifndef _PTHREAD_ATTR_T
-#define _PTHREAD_ATTR_T
-typedef __darwin_pthread_attr_t                pthread_attr_t;
-#endif
+#include <machine/_mcontext.h>

 
 

-#ifndef _SIGSET_T
-#define _SIGSET_T
-typedef __darwin_sigset_t              sigset_t;
-#endif
+#ifndef KERNEL
+#include <sys/_pthread/_pthread_attr_t.h>
+#endif /* KERNEL */

 
 

-#ifndef        _SIZE_T
-#define        _SIZE_T
-typedef        __darwin_size_t                 size_t;
-#endif
+#include <sys/_types/_sigaltstack.h>
+#include <sys/_types/_ucontext.h>

 
 

-#ifndef _UCONTEXT_T
-#define _UCONTEXT_T
-typedef __darwin_ucontext_t            ucontext_t;
-#endif
-
-#ifndef _POSIX_C_SOURCE
-#ifndef _UCONTEXT64_T
-#define _UCONTEXT64_T
-typedef __darwin_ucontext64_t          ucontext64_t;
-#endif
-#endif /* _POSIX_C_SOURCE */
-
-#ifndef _UID_T
-#define _UID_T
-typedef __darwin_uid_t                 uid_t;
-#endif
+#include <sys/_types/_pid_t.h>
+#include <sys/_types/_sigset_t.h>
+#include <sys/_types/_size_t.h>
+#include <sys/_types/_uid_t.h>

 
 union sigval {
        /* Members as suggested by Annex C of POSIX 1003.1b. */
 
 union sigval {
        /* Members as suggested by Annex C of POSIX 1003.1b. */


@@ -189,10 +163,11 @@ union sigval {
        void    *sival_ptr;
 };
 
        void    *sival_ptr;
 };
 

-#define        SIGEV_NONE      0               /* No async notification */
-#define        SIGEV_SIGNAL    1               /* aio - completion notification */
-#define SIGEV_THREAD   3               /* A notification function will be called to perform notification */
+#define        SIGEV_NONE      0       /* No async notification */
+#define        SIGEV_SIGNAL    1       /* aio - completion notification */
+#define        SIGEV_THREAD    3       /* [NOTIMP] [RTS] call notification function */

 
 

+#ifndef KERNEL

 struct sigevent {
        int                             sigev_notify;                           /* Notification type */
        int                             sigev_signo;                            /* Signal number */
 struct sigevent {
        int                             sigev_notify;                           /* Notification type */
        int                             sigev_signo;                            /* Signal number */


@@ -200,20 +175,46 @@ struct sigevent {
        void                    (*sigev_notify_function)(union sigval);   /* Notification function */
        pthread_attr_t  *sigev_notify_attributes;       /* Notification attributes */
 };
        void                    (*sigev_notify_function)(union sigval);   /* Notification function */
        pthread_attr_t  *sigev_notify_attributes;       /* Notification attributes */
 };

+#endif /* KERNEL */

 
 

-// LP64todo - should this move?

 #ifdef BSD_KERNEL_PRIVATE
 
 #ifdef BSD_KERNEL_PRIVATE
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
+union user64_sigval {
+       struct {
+               uint32_t                pad;    /* assumes Motorola byte order */
+               int32_t                 sival_int;
+       } size_equivalent;
+       user64_addr_t   sival_ptr;
+};
+
+union user32_sigval {
+       /* Members as suggested by Annex C of POSIX 1003.1b. */
+       int32_t sival_int;
+       user32_addr_t sival_ptr;
+};

 
 union user_sigval {
        struct {
 
 union user_sigval {
        struct {

-               int             pad;    /* assumes Motorolla byte order */
-               int             sival_int;
+               uint32_t                pad;    /* assumes Motorola byte order */
+               int32_t                 sival_int;

        } size_equivalent;
        } size_equivalent;

-       user_addr_t     sival_ptr;
+       user_addr_t sival_ptr;
+};
+
+struct user64_sigevent {
+       int             sigev_notify;                   /* Notification type */
+       int             sigev_signo;                    /* Signal number */
+       union user64_sigval sigev_value;                        /* Signal value */
+       user64_addr_t   sigev_notify_function;          /* Notify function */
+       user64_addr_t   sigev_notify_attributes;        /* Notify attributes */
+};
+
+struct user32_sigevent {
+       int             sigev_notify;                   /* Notification type */
+       int             sigev_signo;                    /* Signal number */
+       union user32_sigval sigev_value;                        /* Signal value */
+       user32_addr_t   sigev_notify_function;          /* Notify function */
+       user32_addr_t   sigev_notify_attributes;        /* Notify attributes */

 };
 
 struct user_sigevent {
 };
 
 struct user_sigevent {


@@ -224,10 +225,6 @@ struct user_sigevent {
        user_addr_t     sigev_notify_attributes;        /* Notify attributes */
 };
 
        user_addr_t     sigev_notify_attributes;        /* Notify attributes */
 };
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-

 #endif /* BSD_KERNEL_PRIVATE */
 
 typedef struct __siginfo {
 #endif /* BSD_KERNEL_PRIVATE */
 
 typedef struct __siginfo {


@@ -240,48 +237,70 @@ typedef struct __siginfo {
        void    *si_addr;               /* faulting instruction */
        union sigval si_value;          /* signal value */
        long    si_band;                /* band event for SIGPOLL */
        void    *si_addr;               /* faulting instruction */
        union sigval si_value;          /* signal value */
        long    si_band;                /* band event for SIGPOLL */

-       unsigned long   pad[7];         /* Reserved for Future Use */
+       unsigned long   __pad[7];       /* Reserved for Future Use */

 } siginfo_t;
 
 #ifdef BSD_KERNEL_PRIVATE
 
 } siginfo_t;
 
 #ifdef BSD_KERNEL_PRIVATE
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
-typedef struct __user_siginfo {
+typedef struct user_siginfo {

        int             si_signo;       /* signal number */
        int             si_errno;       /* errno association */
        int             si_code;        /* signal code */
        pid_t           si_pid;         /* sending process */
        uid_t           si_uid;         /* sender's ruid */
        int             si_status;      /* exit value */
        int             si_signo;       /* signal number */
        int             si_errno;       /* errno association */
        int             si_code;        /* signal code */
        pid_t           si_pid;         /* sending process */
        uid_t           si_uid;         /* sender's ruid */
        int             si_status;      /* exit value */

-       user_addr_t     si_addr;        /* faulting instruction */
+       user_addr_t     si_addr;        /* faulting instruction (see below) */

        union user_sigval si_value;     /* signal value */
        user_long_t     si_band;        /* band event for SIGPOLL */
        user_ulong_t    pad[7];         /* Reserved for Future Use */
 } user_siginfo_t;
 
        union user_sigval si_value;     /* signal value */
        user_long_t     si_band;        /* band event for SIGPOLL */
        user_ulong_t    pad[7];         /* Reserved for Future Use */
 } user_siginfo_t;
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
+typedef struct user64_siginfo {
+       int             si_signo;       /* signal number */
+       int             si_errno;       /* errno association */
+       int             si_code;        /* signal code */
+       pid_t           si_pid;         /* sending process */
+       uid_t           si_uid;         /* sender's ruid */
+       int             si_status;      /* exit value */
+       user64_addr_t   si_addr;        /* faulting instruction (see below) */
+       union user64_sigval si_value;   /* signal value */
+       user64_long_t   si_band;        /* band event for SIGPOLL */
+       user64_ulong_t  __pad[7];               /* Reserved for Future Use */
+} user64_siginfo_t;
+
+typedef struct user32_siginfo {
+       int             si_signo;       /* signal number */
+       int             si_errno;       /* errno association */
+       int             si_code;        /* signal code */
+       pid_t           si_pid;         /* sending process */
+       uid_t           si_uid;         /* sender's ruid */
+       int             si_status;      /* exit value */
+       user32_addr_t   si_addr;        /* faulting instruction (see below) */
+       union user32_sigval     si_value;       /* signal value */
+       user32_long_t   si_band;        /* band event for SIGPOLL */
+       user32_ulong_t  __pad[7];               /* Reserved for Future Use */
+} user32_siginfo_t;
+
+void siginfo_user_to_user32(user_siginfo_t *, user32_siginfo_t *);
+void siginfo_user_to_user64(user_siginfo_t *, user64_siginfo_t *);

 
 #endif /* BSD_KERNEL_PRIVATE */
 
 /* 
 
 #endif /* BSD_KERNEL_PRIVATE */
 
 /* 

- * Incase of SIGILL and SIGFPE, si_addr contains the address of 
- *  faulting instruction.
- * Incase of SIGSEGV and SIGBUS, si_addr contains address of 
- *  faulting memory reference.
- * Incase of SIGCHLD, si_pid willhave child process ID,
- *  si_status will contain exit value or signal.
- *  si_uid contains real user ID of the process that sent the signal
+ * When the signal is SIGILL or SIGFPE, si_addr contains the address of 
+ * the faulting instruction.
+ * When the signal is SIGSEGV or SIGBUS, si_addr contains the address of 
+ * the faulting memory reference. Although for x86 there are cases of SIGSEGV
+ * for which si_addr cannot be determined and is NULL. 
+ * If the signal is SIGCHLD, the si_pid field will contain the child process ID,
+ *  si_status contains the exit value or signal and
+ *  si_uid contains the real user ID of the process that sent the signal.

  */
 
 /* Values for si_code */
 
 /* Codes for SIGILL */
  */
 
 /* Values for si_code */
 
 /* Codes for SIGILL */

-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

 #define        ILL_NOOP        0       /* if only I knew... */
 #endif
 #define        ILL_ILLOPC      1       /* [XSI] illegal opcode */
 #define        ILL_NOOP        0       /* if only I knew... */
 #endif
 #define        ILL_ILLOPC      1       /* [XSI] illegal opcode */


@@ -294,7 +313,7 @@ typedef struct __user_siginfo {
 #define        ILL_BADSTK      8       /* [XSI] internal stack error -NOTIMP */
 
 /* Codes for SIGFPE */
 #define        ILL_BADSTK      8       /* [XSI] internal stack error -NOTIMP */
 
 /* Codes for SIGFPE */

-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

 #define        FPE_NOOP        0       /* if only I knew... */
 #endif
 #define FPE_FLTDIV     1       /* [XSI] floating point divide by zero */
 #define        FPE_NOOP        0       /* if only I knew... */
 #endif
 #define FPE_FLTDIV     1       /* [XSI] floating point divide by zero */


@@ -303,18 +322,18 @@ typedef struct __user_siginfo {
 #define FPE_FLTRES     4       /* [XSI] floating point inexact result */
 #define FPE_FLTINV     5       /* [XSI] invalid floating point operation */
 #define        FPE_FLTSUB      6       /* [XSI] subscript out of range -NOTIMP */
 #define FPE_FLTRES     4       /* [XSI] floating point inexact result */
 #define FPE_FLTINV     5       /* [XSI] invalid floating point operation */
 #define        FPE_FLTSUB      6       /* [XSI] subscript out of range -NOTIMP */

-#define        FPE_INTDIV      7       /* [XSI] integer divide by zero -NOTIMP */
-#define        FPE_INTOVF      8       /* [XSI] integer overflow -NOTIMP */
+#define        FPE_INTDIV      7       /* [XSI] integer divide by zero */
+#define        FPE_INTOVF      8       /* [XSI] integer overflow */

 
 /* Codes for SIGSEGV */
 
 /* Codes for SIGSEGV */

-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

 #define        SEGV_NOOP       0       /* if only I knew... */
 #endif
 #define        SEGV_MAPERR     1       /* [XSI] address not mapped to object */
 #define        SEGV_ACCERR     2       /* [XSI] invalid permission for mapped object */
 
 /* Codes for SIGBUS */
 #define        SEGV_NOOP       0       /* if only I knew... */
 #endif
 #define        SEGV_MAPERR     1       /* [XSI] address not mapped to object */
 #define        SEGV_ACCERR     2       /* [XSI] invalid permission for mapped object */
 
 /* Codes for SIGBUS */

-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

 #define        BUS_NOOP        0       /* if only I knew... */
 #endif
 #define        BUS_ADRALN      1       /* [XSI] Invalid address alignment */
 #define        BUS_NOOP        0       /* if only I knew... */
 #endif
 #define        BUS_ADRALN      1       /* [XSI] Invalid address alignment */


@@ -326,7 +345,7 @@ typedef struct __user_siginfo {
 #define        TRAP_TRACE      2       /* [XSI] Process trace trap -NOTIMP */
 
 /* Codes for SIGCHLD */
 #define        TRAP_TRACE      2       /* [XSI] Process trace trap -NOTIMP */
 
 /* Codes for SIGCHLD */

-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

 #define        CLD_NOOP        0       /* if only I knew... */
 #endif
 #define        CLD_EXITED      1       /* [XSI] child has exited */
 #define        CLD_NOOP        0       /* if only I knew... */
 #endif
 #define        CLD_EXITED      1       /* [XSI] child has exited */


@@ -371,32 +390,60 @@ struct    sigaction {
 #ifdef BSD_KERNEL_PRIVATE
 #include <machine/types.h>
 
 #ifdef BSD_KERNEL_PRIVATE
 #include <machine/types.h>
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
+union __user32_sigaction_u {
+       user32_addr_t __sa_handler;
+       user32_addr_t __sa_sigaction;
+};
+
+struct user32_sigaction {
+       union __user32_sigaction_u __sigaction_u;  /* signal handler */
+       sigset_t sa_mask;               /* signal mask to apply */
+       int     sa_flags;               /* see signal options below */
+};
+
+struct __user32_sigaction {
+       union __user32_sigaction_u __sigaction_u;  /* signal handler */
+       user32_addr_t sa_tramp;
+       sigset_t sa_mask;               /* signal mask to apply */
+       int     sa_flags;               /* see signal options below */
+};
+
+union __user64_sigaction_u {
+       user64_addr_t   __sa_handler;
+       user64_addr_t   __sa_sigaction;
+};
+
+struct user64_sigaction {
+       union __user64_sigaction_u __sigaction_u;  /* signal handler */
+       sigset_t sa_mask;               /* signal mask to apply */
+       int     sa_flags;               /* see signal options below */
+};
+
+struct __user64_sigaction {
+       union __user64_sigaction_u __sigaction_u;  /* signal handler */
+       user64_addr_t   sa_tramp;       /* signal mask to apply */
+       sigset_t sa_mask;               /* signal mask to apply */
+       int     sa_flags;               /* see signal options below */
+};

 
 

-union __user_sigaction_u {
+union __kern_sigaction_u {

        user_addr_t     __sa_handler;
        user_addr_t     __sa_sigaction;
 };
 
        user_addr_t     __sa_handler;
        user_addr_t     __sa_sigaction;
 };
 

-struct user_sigaction {
-       union __user_sigaction_u __sigaction_u;  /* signal handler */
+struct kern_sigaction {
+       union __kern_sigaction_u __sigaction_u;  /* signal handler */

        sigset_t sa_mask;               /* signal mask to apply */
        int     sa_flags;               /* see signal options below */
 };
 
        sigset_t sa_mask;               /* signal mask to apply */
        int     sa_flags;               /* see signal options below */
 };
 

-struct __user_sigaction {
-       union __user_sigaction_u __sigaction_u;  /* signal handler */
+struct __kern_sigaction {
+       union __kern_sigaction_u __sigaction_u;  /* signal handler */

        user_addr_t     sa_tramp;       /* signal mask to apply */
        sigset_t sa_mask;               /* signal mask to apply */
        int     sa_flags;               /* see signal options below */
 };
 
        user_addr_t     sa_tramp;       /* signal mask to apply */
        sigset_t sa_mask;               /* signal mask to apply */
        int     sa_flags;               /* see signal options below */
 };
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-

 #undef SIG_DFL
 #undef SIG_IGN
 #undef SIG_ERR
 #undef SIG_DFL
 #undef SIG_IGN
 #undef SIG_ERR


@@ -413,17 +460,24 @@ struct    __user_sigaction {
 
 #define SA_ONSTACK     0x0001  /* take signal on signal stack */
 #define SA_RESTART     0x0002  /* restart system on signal return */
 
 #define SA_ONSTACK     0x0001  /* take signal on signal stack */
 #define SA_RESTART     0x0002  /* restart system on signal return */

-#define        SA_DISABLE      0x0004  /* disable taking signals on alternate stack */
+#ifdef BSD_KERNEL_PRIVATE
+#define        SA_DISABLE      0x0004  /* disable taking signals on alternate stack - for user_sigaltstack.ss_flags only */
+#endif /* BSD_KERNEL_PRIVATE */

 #define        SA_RESETHAND    0x0004  /* reset to SIG_DFL when taking signal */
 #define SA_NOCLDSTOP   0x0008  /* do not generate SIGCHLD on child stop */
 #define        SA_NODEFER      0x0010  /* don't mask the signal we're delivering */
 #define        SA_NOCLDWAIT    0x0020  /* don't keep zombies around */
 #define        SA_SIGINFO      0x0040  /* signal handler with SA_SIGINFO args */
 #define        SA_RESETHAND    0x0004  /* reset to SIG_DFL when taking signal */
 #define SA_NOCLDSTOP   0x0008  /* do not generate SIGCHLD on child stop */
 #define        SA_NODEFER      0x0010  /* don't mask the signal we're delivering */
 #define        SA_NOCLDWAIT    0x0020  /* don't keep zombies around */
 #define        SA_SIGINFO      0x0040  /* signal handler with SA_SIGINFO args */

-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

 #define        SA_USERTRAMP    0x0100  /* do not bounce off kernel's sigtramp */
 /* This will provide 64bit register set in a 32bit user address space */
 #define        SA_64REGSET     0x0200  /* signal handler with SA_SIGINFO args with 64bit regs information */
 #define        SA_USERTRAMP    0x0100  /* do not bounce off kernel's sigtramp */
 /* This will provide 64bit register set in a 32bit user address space */
 #define        SA_64REGSET     0x0200  /* signal handler with SA_SIGINFO args with 64bit regs information */

-#endif /* !_POSIX_C_SOURCE */
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+/* the following are the only bits we support from user space, the 
+ * rest are for kernel use only.
+ */
+#define SA_USERSPACE_MASK (SA_ONSTACK | SA_RESTART | SA_RESETHAND | SA_NOCLDSTOP | SA_NODEFER | SA_NOCLDWAIT | SA_SIGINFO)

 
 /*
  * Flags for sigprocmask:
 
 /*
  * Flags for sigprocmask:


@@ -439,7 +493,7 @@ struct      __user_sigaction {
 #define SI_ASYNCIO     0x10004 /* [CX] aio request completion */
 #define SI_MESGQ       0x10005 /* [CX] from message arrival on empty queue */
 
 #define SI_ASYNCIO     0x10004 /* [CX] aio request completion */
 #define SI_MESGQ       0x10005 /* [CX] from message arrival on empty queue */
 

-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

 typedef        void (*sig_t)(int);     /* type of signal function */
 #endif
 
 typedef        void (*sig_t)(int);     /* type of signal function */
 #endif
 


@@ -448,33 +502,32 @@ typedef   void (*sig_t)(int);     /* type of signal function */
  */
 #ifdef BSD_KERNEL_PRIVATE
 
  */
 #ifdef BSD_KERNEL_PRIVATE
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
+struct  user32_sigaltstack {
+       user32_addr_t   ss_sp;          /* signal stack base */
+       user32_size_t   ss_size;        /* signal stack length */
+       int                 ss_flags;   /* SA_DISABLE and/or SA_ONSTACK */
+};
+
+struct  user64_sigaltstack {
+       user64_addr_t   ss_sp;          /* signal stack base */
+       user64_size_t   ss_size;        /* signal stack length */
+       int             ss_flags;       /* SA_DISABLE and/or SA_ONSTACK */
+};

 
 

-struct  user_sigaltstack {
+struct  kern_sigaltstack {

        user_addr_t     ss_sp;          /* signal stack base */
        user_size_t     ss_size;        /* signal stack length */
        int             ss_flags;       /* SA_DISABLE and/or SA_ONSTACK */
 };
 
        user_addr_t     ss_sp;          /* signal stack base */
        user_size_t     ss_size;        /* signal stack length */
        int             ss_flags;       /* SA_DISABLE and/or SA_ONSTACK */
 };
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-

 #endif /* BSD_KERNEL_PRIVATE */
 
 #endif /* BSD_KERNEL_PRIVATE */
 

-#ifndef _STACK_T
-#define _STACK_T
-typedef __darwin_stack_t stack_t;
-#endif
-

 #define SS_ONSTACK     0x0001  /* take signal on signal stack */
 #define        SS_DISABLE      0x0004  /* disable taking signals on alternate stack */
 #define        MINSIGSTKSZ     32768   /* (32K)minimum allowable stack */
 #define        SIGSTKSZ        131072  /* (128K)recommended stack size */
 
 #define SS_ONSTACK     0x0001  /* take signal on signal stack */
 #define        SS_DISABLE      0x0004  /* disable taking signals on alternate stack */
 #define        MINSIGSTKSZ     32768   /* (32K)minimum allowable stack */
 #define        SIGSTKSZ        131072  /* (128K)recommended stack size */
 

-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

 /*
  * 4.3 compatibility:
  * Signal vector "template" used in sigvec call.
 /*
  * 4.3 compatibility:
  * Signal vector "template" used in sigvec call.


@@ -493,7 +546,7 @@ struct      sigvec {
 #define SV_SIGINFO     SA_SIGINFO
 
 #define sv_onstack sv_flags    /* isn't compatibility wonderful! */
 #define SV_SIGINFO     SA_SIGINFO
 
 #define sv_onstack sv_flags    /* isn't compatibility wonderful! */

-#endif /* !_POSIX_C_SOURCE */
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */

 
 /*
  * Structure used in sigstack call.
 
 /*
  * Structure used in sigstack call.


@@ -503,14 +556,14 @@ struct    sigstack {
        int     ss_onstack;             /* current status */
 };
 
        int     ss_onstack;             /* current status */
 };
 

-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

 /*
  * Macro for converting signal number to a mask suitable for
  * sigblock().
  */
 #define sigmask(m)     (1 << ((m)-1))
 
 /*
  * Macro for converting signal number to a mask suitable for
  * sigblock().
  */
 #define sigmask(m)     (1 << ((m)-1))
 

-#ifdef BSD_KERNEL_PRIVATE
+#ifdef KERNEL_PRIVATE

 /*
  *     signals delivered on a per-thread basis.
  */
 /*
  *     signals delivered on a per-thread basis.
  */


@@ -518,12 +571,25 @@ struct    sigstack {
                    sigmask(SIGIOT)|sigmask(SIGEMT)|\
                    sigmask(SIGFPE)|sigmask(SIGBUS)|\
                    sigmask(SIGSEGV)|sigmask(SIGSYS)|\
                    sigmask(SIGIOT)|sigmask(SIGEMT)|\
                    sigmask(SIGFPE)|sigmask(SIGBUS)|\
                    sigmask(SIGSEGV)|sigmask(SIGSYS)|\

-                   sigmask(SIGPIPE))
-#endif /* BSD_KERNEL_PRIVATE */
+                   sigmask(SIGPIPE)|sigmask(SIGKILL))
+
+#define workq_threadmask (threadmask | sigcantmask | sigmask(SIGPROF))
+
+/*
+ * Signals carried across exec.
+ */
+#define execmask   (sigmask(SIGHUP)|sigmask(SIGINT)|\
+                   sigmask(SIGQUIT)|sigmask(SIGKILL)|\
+                   sigmask(SIGTERM)|sigmask(SIGSTOP)|\
+                   sigmask(SIGTSTP)|sigmask(SIGCONT)|\
+                   sigmask(SIGTTIN)|sigmask(SIGTTOU)|\
+                   sigmask(SIGUSR1)|sigmask(SIGUSR2))
+
+#endif /* KERNEL_PRIVATE */

 
 #define        BADSIG          SIG_ERR
 
 
 #define        BADSIG          SIG_ERR
 

-#endif /* !_POSIX_C_SOURCE */
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */

 #endif /* !_ANSI_SOURCE */
 
 /*
 #endif /* !_ANSI_SOURCE */
 
 /*