xnu-792.6.61.tar.gz

[apple/xnu.git] / osfmk / kern / exception.c

diff --git a/osfmk/kern/exception.c b/osfmk/kern/exception.c
index 306470b3683a5bb8df877114b359122178373ad9..67abd9fbf81dda04feedafe3d50aa83d64c6bd09 100644 (file)
--- a/osfmk/kern/exception.c
+++ b/osfmk/kern/exception.c
@@ -1,5 +1,5 @@
 /*
 /*

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

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -58,6 +58,7 @@
 #include <mach/message.h>
 #include <mach/port.h>
 #include <mach/mig_errors.h>
 #include <mach/message.h>
 #include <mach/port.h>
 #include <mach/mig_errors.h>

+#include <mach/task.h>

 #include <mach/thread_status.h>
 #include <mach/exception_types.h>
 #include <ipc/port.h>
 #include <mach/thread_status.h>
 #include <mach/exception_types.h>
 #include <ipc/port.h>


@@ -67,12 +68,10 @@
 #include <ipc/ipc_space.h>
 #include <ipc/ipc_pset.h>
 #include <ipc/ipc_machdep.h>
 #include <ipc/ipc_space.h>
 #include <ipc/ipc_pset.h>
 #include <ipc/ipc_machdep.h>

-#include <kern/etap_macros.h>

 #include <kern/counters.h>
 #include <kern/ipc_tt.h>
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <kern/counters.h>
 #include <kern/ipc_tt.h>
 #include <kern/task.h>
 #include <kern/thread.h>

-#include <kern/thread_swap.h>

 #include <kern/processor.h>
 #include <kern/sched.h>
 #include <kern/sched_prim.h>
 #include <kern/processor.h>
 #include <kern/sched.h>
 #include <kern/sched_prim.h>


@@ -104,6 +103,20 @@ unsigned long c_tsk_exc_raise = 0;
 unsigned long c_tsk_exc_raise_state = 0;
 unsigned long c_tsk_exc_raise_state_id = 0;
 
 unsigned long c_tsk_exc_raise_state = 0;
 unsigned long c_tsk_exc_raise_state_id = 0;
 

+/* forward declarations */
+void exception_deliver(
+       exception_type_t        exception,
+       exception_data_t        code,
+       mach_msg_type_number_t  codeCnt,
+       struct exception_action *excp,
+       mutex_t                 *mutex);
+
+#ifdef MACH_BSD
+kern_return_t bsd_exception(
+       exception_type_t        exception,
+       exception_data_t        code,
+       mach_msg_type_number_t  codeCnt);
+#endif /* MACH_BSD */

 
 /*
  *     Routine:        exception_deliver
 
 /*
  *     Routine:        exception_deliver


@@ -125,7 +138,7 @@ exception_deliver(
        struct exception_action *excp,
        mutex_t                 *mutex)
 {
        struct exception_action *excp,
        mutex_t                 *mutex)
 {

-       thread_act_t            a_self = current_act();
+       thread_t                self = current_thread();

        ipc_port_t              exc_port;
        int                     behavior;
        int                     flavor;
        ipc_port_t              exc_port;
        int                     behavior;
        int                     flavor;


@@ -135,7 +148,7 @@ exception_deliver(
         *  Save work if we are terminating.
         *  Just go back to our AST handler.
         */
         *  Save work if we are terminating.
         *  Just go back to our AST handler.
         */

-       if (!a_self->active)
+       if (!self->active)

                thread_exception_return();
 
        /*
                thread_exception_return();
 
        /*


@@ -171,8 +184,8 @@ exception_deliver(
                thread_state_data_t state;
 
                c_thr_exc_raise_state++;
                thread_state_data_t state;
 
                c_thr_exc_raise_state++;

-               state_cnt = state_count[flavor];
-               kr = thread_getstatus(a_self, flavor, 
+               state_cnt = _MachineStateCount[flavor];
+               kr = thread_getstatus(self, flavor, 

                                      (thread_state_t)state,
                                      &state_cnt);
                if (kr == KERN_SUCCESS) {
                                      (thread_state_t)state,
                                      &state_cnt);
                if (kr == KERN_SUCCESS) {


@@ -182,7 +195,7 @@ exception_deliver(
                                                   state, state_cnt,
                                                   state, &state_cnt);
                        if (kr == MACH_MSG_SUCCESS)
                                                   state, state_cnt,
                                                   state, &state_cnt);
                        if (kr == MACH_MSG_SUCCESS)

-                               kr = thread_setstatus(a_self, flavor, 
+                               kr = thread_setstatus(self, flavor, 

                                                      (thread_state_t)state,
                                                      state_cnt);
                }
                                                      (thread_state_t)state,
                                                      state_cnt);
                }


@@ -196,8 +209,8 @@ exception_deliver(
        case EXCEPTION_DEFAULT:
                c_thr_exc_raise++;
                kr = exception_raise(exc_port,
        case EXCEPTION_DEFAULT:
                c_thr_exc_raise++;
                kr = exception_raise(exc_port,

-                               retrieve_act_self_fast(a_self),
-                               retrieve_task_self_fast(a_self->task),
+                               retrieve_thread_self_fast(self),
+                               retrieve_task_self_fast(self->task),

                                exception,
                                code, codeCnt);
 
                                exception,
                                code, codeCnt);
 


@@ -211,21 +224,21 @@ exception_deliver(
                thread_state_data_t state;
 
                c_thr_exc_raise_state_id++;
                thread_state_data_t state;
 
                c_thr_exc_raise_state_id++;

-               state_cnt = state_count[flavor];
-               kr = thread_getstatus(a_self, flavor,
+               state_cnt = _MachineStateCount[flavor];
+               kr = thread_getstatus(self, flavor,

                                      (thread_state_t)state,
                                      &state_cnt);
                if (kr == KERN_SUCCESS) {
                    kr = exception_raise_state_identity(exc_port,
                                      (thread_state_t)state,
                                      &state_cnt);
                if (kr == KERN_SUCCESS) {
                    kr = exception_raise_state_identity(exc_port,

-                               retrieve_act_self_fast(a_self),
-                               retrieve_task_self_fast(a_self->task),
+                               retrieve_thread_self_fast(self),
+                               retrieve_task_self_fast(self->task),

                                exception,
                                code, codeCnt,
                                &flavor,
                                state, state_cnt,
                                state, &state_cnt);
                    if (kr == MACH_MSG_SUCCESS)
                                exception,
                                code, codeCnt,
                                &flavor,
                                state, state_cnt,
                                state, &state_cnt);
                    if (kr == MACH_MSG_SUCCESS)

-                       kr = thread_setstatus(a_self, flavor,
+                       kr = thread_setstatus(self, flavor,

                                              (thread_state_t)state,
                                              state_cnt);
                }
                                              (thread_state_t)state,
                                              state_cnt);
                }


@@ -255,12 +268,12 @@ exception_deliver(
  *             Doesn't return.
  */
 void
  *             Doesn't return.
  */
 void

-exception(
+exception_triage(

        exception_type_t        exception,
        exception_data_t        code,
        mach_msg_type_number_t  codeCnt)
 {
        exception_type_t        exception,
        exception_data_t        code,
        mach_msg_type_number_t  codeCnt)
 {

-       thread_act_t            thr_act;
+       thread_t                thread;

        task_t                  task;
        host_priv_t             host_priv;
        struct exception_action *excp;
        task_t                  task;
        host_priv_t             host_priv;
        struct exception_action *excp;


@@ -274,9 +287,9 @@ exception(
        /*
         * Try to raise the exception at the activation level.
         */
        /*
         * Try to raise the exception at the activation level.
         */

-       thr_act = current_act();
-       mutex = mutex_addr(thr_act->lock);
-       excp = &thr_act->exc_actions[exception];
+       thread = current_thread();
+       mutex = mutex_addr(thread->mutex);
+       excp = &thread->exc_actions[exception];

        exception_deliver(exception, code, codeCnt, excp, mutex);
 
        /*
        exception_deliver(exception, code, codeCnt, excp, mutex);
 
        /*


@@ -323,10 +336,9 @@ bsd_exception(
        mach_msg_type_number_t  codeCnt)
 {
        task_t                  task;
        mach_msg_type_number_t  codeCnt)
 {
        task_t                  task;

-       host_priv_t             host_priv;

        struct exception_action *excp;
        mutex_t                 *mutex;
        struct exception_action *excp;
        mutex_t                 *mutex;

-       thread_act_t            a_self = current_act();
+       thread_t                self = current_thread();

        ipc_port_t              exc_port;
        int                     behavior;
        int                     flavor;
        ipc_port_t              exc_port;
        int                     behavior;
        int                     flavor;


@@ -343,7 +355,7 @@ bsd_exception(
         *  Save work if we are terminating.
         *  Just go back to our AST handler.
         */
         *  Save work if we are terminating.
         *  Just go back to our AST handler.
         */

-       if (!a_self->active) {
+       if (!self->active) {

                return(KERN_FAILURE);
        }
 
                return(KERN_FAILURE);
        }
 


@@ -380,8 +392,8 @@ bsd_exception(
                thread_state_data_t state;
 
                c_thr_exc_raise_state++;
                thread_state_data_t state;
 
                c_thr_exc_raise_state++;

-               state_cnt = state_count[flavor];
-               kr = thread_getstatus(a_self, flavor, 
+               state_cnt = _MachineStateCount[flavor];
+               kr = thread_getstatus(self, flavor, 

                                      (thread_state_t)state,
                                      &state_cnt);
                if (kr == KERN_SUCCESS) {
                                      (thread_state_t)state,
                                      &state_cnt);
                if (kr == KERN_SUCCESS) {


@@ -391,7 +403,7 @@ bsd_exception(
                                                   state, state_cnt,
                                                   state, &state_cnt);
                        if (kr == MACH_MSG_SUCCESS)
                                                   state, state_cnt,
                                                   state, &state_cnt);
                        if (kr == MACH_MSG_SUCCESS)

-                               kr = thread_setstatus(a_self, flavor, 
+                               kr = thread_setstatus(self, flavor, 

                                                      (thread_state_t)state,
                                                      state_cnt);
                }
                                                      (thread_state_t)state,
                                                      state_cnt);
                }


@@ -405,8 +417,8 @@ bsd_exception(
        case EXCEPTION_DEFAULT:
                c_thr_exc_raise++;
                kr = exception_raise(exc_port,
        case EXCEPTION_DEFAULT:
                c_thr_exc_raise++;
                kr = exception_raise(exc_port,

-                               retrieve_act_self_fast(a_self),
-                               retrieve_task_self_fast(a_self->task),
+                               retrieve_thread_self_fast(self),
+                               retrieve_task_self_fast(self->task),

                                exception,
                                code, codeCnt);
 
                                exception,
                                code, codeCnt);
 


@@ -419,21 +431,21 @@ bsd_exception(
                thread_state_data_t state;
 
                c_thr_exc_raise_state_id++;
                thread_state_data_t state;
 
                c_thr_exc_raise_state_id++;

-               state_cnt = state_count[flavor];
-               kr = thread_getstatus(a_self, flavor,
+               state_cnt = _MachineStateCount[flavor];
+               kr = thread_getstatus(self, flavor,

                                      (thread_state_t)state,
                                      &state_cnt);
                if (kr == KERN_SUCCESS) {
                    kr = exception_raise_state_identity(exc_port,
                                      (thread_state_t)state,
                                      &state_cnt);
                if (kr == KERN_SUCCESS) {
                    kr = exception_raise_state_identity(exc_port,

-                               retrieve_act_self_fast(a_self),
-                               retrieve_task_self_fast(a_self->task),
+                               retrieve_thread_self_fast(self),
+                               retrieve_task_self_fast(self->task),

                                exception,
                                code, codeCnt,
                                &flavor,
                                state, state_cnt,
                                state, &state_cnt);
                    if (kr == MACH_MSG_SUCCESS)
                                exception,
                                code, codeCnt,
                                &flavor,
                                state, state_cnt,
                                state, &state_cnt);
                    if (kr == MACH_MSG_SUCCESS)

-                       kr = thread_setstatus(a_self, flavor,
+                       kr = thread_setstatus(self, flavor,

                                              (thread_state_t)state,
                                              state_cnt);
                }
                                              (thread_state_t)state,
                                              state_cnt);
                }


@@ -464,12 +476,9 @@ kern_return_t sys_perf_notify(struct task *task,
 {
        host_priv_t             hostp;
        struct exception_action *excp;
 {
        host_priv_t             hostp;
        struct exception_action *excp;

-       thread_act_t    act = current_act();
-       thread_t                thr = current_thread();
+       thread_t                thread = current_thread();

        ipc_port_t              xport;
        kern_return_t   ret;
        ipc_port_t              xport;
        kern_return_t   ret;

-       int                             abrt;
-       spl_t                   ints;

        wait_interrupt_t        wsave;
 
        hostp = host_priv_self();                               /* Get the host privileged ports */
        wait_interrupt_t        wsave;
 
        hostp = host_priv_self();                               /* Get the host privileged ports */


@@ -504,8 +513,8 @@ kern_return_t sys_perf_notify(struct task *task,
        wsave = thread_interrupt_level(THREAD_UNINT);   /* Make sure we aren't aborted here */
        
        ret = exception_raise(xport,                    /* Send the exception to the perf handler */
        wsave = thread_interrupt_level(THREAD_UNINT);   /* Make sure we aren't aborted here */
        
        ret = exception_raise(xport,                    /* Send the exception to the perf handler */

-               retrieve_act_self_fast(act),            /* Not always the dying guy */
-               retrieve_task_self_fast(act->task),     /* Not always the dying guy */
+               retrieve_thread_self_fast(thread),              /* Not always the dying guy */
+               retrieve_task_self_fast(thread->task),  /* Not always the dying guy */

                EXC_RPC_ALERT,                                          /* Unused exception type until now */
                code, codeCnt); 
                
                EXC_RPC_ALERT,                                          /* Unused exception type until now */
                code, codeCnt); 
                


@@ -513,4 +522,3 @@ kern_return_t sys_perf_notify(struct task *task,
 
        return(ret);                                                    /* Tell caller how it went */
 }
 
        return(ret);                                                    /* Tell caller how it went */
 }

-