xnu-3789.41.3.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 38ee8e3acc9c0196b52add713926e8cac4f29888..19b0e003feb20fbd9678c6556fcdd7ea3955d448 100644 (file)
--- a/pexpert/i386/pe_interrupt.c
+++ b/pexpert/i386/pe_interrupt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -28,11 +28,12 @@
 #include <pexpert/pexpert.h>
 #include <pexpert/protos.h>
 #include <machine/machine_routines.h>
-#include <i386/mp.h>
-#include <sys/kdebug.h>
 
+#if CONFIG_DTRACE && DEVELOPMENT
+#include <mach/sdt.h>
+#endif
 
-void PE_incoming_interrupt(x86_saved_state_t *);
+void PE_incoming_interrupt(int);
 
 
 struct i386_interrupt_handler {
@@ -49,43 +50,25 @@ i386_interrupt_handler_t    PE_interrupt_handler;
 
 
 void
-PE_incoming_interrupt(x86_saved_state_t *state)
+PE_incoming_interrupt(int interrupt)
 {
        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,
-               interrupt, (unsigned int)rip, user_mode, 0, 0);
 
        vector = &PE_interrupt_handler;
 
-       if (!lapic_interrupt(interrupt, state)) {
-               vector->handler(vector->target, NULL, vector->nub, interrupt);
-       }
+#if CONFIG_DTRACE && DEVELOPMENT
+        DTRACE_INT5(interrupt_start, void *, vector->nub, int, 0, 
+                    void *, vector->target, IOInterruptHandler, vector->handler,
+                    void *, vector->refCon);
+#endif
 
-       KERNEL_DEBUG_CONSTANT(
-               MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_END,
-               0, 0, 0, 0, 0);
+       vector->handler(vector->target, NULL, vector->nub, interrupt);
+
+#if CONFIG_DTRACE && DEVELOPMENT
+        DTRACE_INT5(interrupt_complete, void *, vector->nub, int, 0, 
+                    void *, vector->target, IOInterruptHandler, vector->handler,
+                    void *, vector->refCon);
+#endif
 }
 
 void PE_install_interrupt_handler(void *nub,