xnu-792.10.96.tar.gz

[apple/xnu.git] / pexpert / i386 / pe_interrupt.c

diff --git a/pexpert/i386/pe_interrupt.c b/pexpert/i386/pe_interrupt.c
index a3d3a3a64d230c1edf0884c816da23f1b735255f..49afab3d56c0c02ca1833412f95254c577d8241a 100644 (file)
--- a/pexpert/i386/pe_interrupt.c
+++ b/pexpert/i386/pe_interrupt.c
@@ -22,8 +22,13 @@
 #include <pexpert/pexpert.h>
 #include <pexpert/protos.h>
 #include <machine/machine_routines.h>
+#include <i386/mp.h>
 #include <sys/kdebug.h>
 
+
+void PE_incoming_interrupt(x86_saved_state_t *);
+
+
 struct i386_interrupt_handler {
        IOInterruptHandler      handler;
        void                    *nub;
@@ -35,30 +40,50 @@ typedef struct i386_interrupt_handler i386_interrupt_handler_t;
 
 i386_interrupt_handler_t       PE_interrupt_handler;
 
-void PE_platform_interrupt_initialize(void)
-{
-}
+
 
 void
-PE_incoming_interrupt(int interrupt, void *eip)
+PE_incoming_interrupt(x86_saved_state_t *state)
 {
-       boolean_t               save_int;
        i386_interrupt_handler_t        *vector;
+       uint64_t                        rip;
+       int                             interrupt;
+       boolean_t                       user_mode = FALSE;
+
+        if (is_saved_state64(state) == TRUE) {
+               x86_saved_state64_t     *state64;
+
+               state64 = saved_state64(state);
+               rip = state64->isf.rip;
+               interrupt = state64->isf.trapno;
+               user_mode = TRUE;
+       } else {
+               x86_saved_state32_t     *state32;
+
+               state32 = saved_state32(state);
+               if (state32->cs & 0x03)
+                       user_mode = TRUE;
+               rip = state32->eip;
+               interrupt = state32->trapno;
+       }
 
-       KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_START,
-          0, (unsigned int)eip, 0, 0, 0);
+       KERNEL_DEBUG_CONSTANT(
+               MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_START,
+               interrupt, (unsigned int)rip, user_mode, 0, 0);
 
        vector = &PE_interrupt_handler;
-       save_int  = ml_set_interrupts_enabled(FALSE);
-       vector->handler(vector->target, vector->refCon, vector->nub, interrupt);
-       ml_set_interrupts_enabled(save_int);
 
-       KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_END,
-          0, 0, 0, 0, 0);
+       if (!lapic_interrupt(interrupt, state)) {
+               vector->handler(vector->target, NULL, vector->nub, interrupt);
+       }
 
+       KERNEL_DEBUG_CONSTANT(
+               MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_END,
+               0, 0, 0, 0, 0);
 }
 
-void PE_install_interrupt_handler(void *nub, int source,
+void PE_install_interrupt_handler(void *nub,
+                                 __unused int source,
                                  void *target,
                                  IOInterruptHandler handler,
                                  void *refCon)