xnu-6153.141.1.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 316bf97806695650e7f97a1c8e961387ada1ac57..df8fa655498a0c604329f33698d83471d7315e97 100644 (file)
--- a/pexpert/i386/pe_interrupt.c
+++ b/pexpert/i386/pe_interrupt.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * 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
@@ -11,10 +11,10 @@
  * 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.
- * 
+ *
  * 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,
@@ -22,95 +22,63 @@
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 #include <pexpert/pexpert.h>
 #include <pexpert/protos.h>
 #include <machine/machine_routines.h>
-#include <i386/lapic.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 {
-       IOInterruptHandler      handler;
-       void                    *nub;
-       void                    *target;
-       void                    *refCon;
+       IOInterruptHandler      handler;
+       void                    *nub;
+       void                    *target;
+       void                    *refCon;
 };
 
 typedef struct i386_interrupt_handler i386_interrupt_handler_t;
 
-i386_interrupt_handler_t       PE_interrupt_handler;
+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);
+       i386_interrupt_handler_t        *vector;
 
        vector = &PE_interrupt_handler;
 
 #if CONFIG_DTRACE && DEVELOPMENT
-            DTRACE_INT5(interrupt_start, void *, vector->nub, int, 0, 
-                        void *, vector->target, IOInterruptHandler, vector->handler,
-                        void *, vector->refCon);
+       DTRACE_INT5(interrupt_start, void *, vector->nub, int, 0,
+           void *, vector->target, IOInterruptHandler, vector->handler,
+           void *, vector->refCon);
 #endif
 
-       if (!lapic_interrupt(interrupt, state)) {
-               vector->handler(vector->target, NULL, vector->nub, interrupt);
-       }
+       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);
+       DTRACE_INT5(interrupt_complete, 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);
 }
 
-void PE_install_interrupt_handler(void *nub,
-                                 __unused int source,
-                                 void *target,
-                                 IOInterruptHandler handler,
-                                 void *refCon)
+void
+PE_install_interrupt_handler(void *nub,
+    __unused int source,
+    void *target,
+    IOInterruptHandler handler,
+    void *refCon)
 {
-       i386_interrupt_handler_t        *vector;
+       i386_interrupt_handler_t        *vector;
 
        vector = &PE_interrupt_handler;