X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e..eb6b6ca394357805f2bdba989abae309f718b4d8:/pexpert/i386/pe_interrupt.c

diff --git a/pexpert/i386/pe_interrupt.c b/pexpert/i386/pe_interrupt.c
index 953662fa3..df8fa6554 100644
--- a/pexpert/i386/pe_interrupt.c
+++ b/pexpert/i386/pe_interrupt.c
@@ -1,102 +1,84 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_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 
- * 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.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ 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.
  *
- * 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, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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,
+ * 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_OSREFERENCE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #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 {
-	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 (!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
+
+	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);
+#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,
-				  __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;