xnu-344.49.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 533bf485c975cbcb9bbfdb199dd0c3ae7cec38b1..2040b0e4690f93bb2fae0aa9612ca269a5ffc125 100644 (file)
--- a/pexpert/i386/pe_interrupt.c
+++ b/pexpert/i386/pe_interrupt.c
@@ -3,25 +3,29 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_HEADER_END@
  */
 #include <pexpert/pexpert.h>
 #include <pexpert/protos.h>
 #include <machine/machine_routines.h>
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
 #include <pexpert/pexpert.h>
 #include <pexpert/protos.h>
 #include <machine/machine_routines.h>

+#include <sys/kdebug.h>

 
 struct i386_interrupt_handler {
        IOInterruptHandler      handler;
 
 struct i386_interrupt_handler {
        IOInterruptHandler      handler;


@@ -39,17 +43,22 @@ void PE_platform_interrupt_initialize(void)
 }
 
 void
 }
 
 void

-PE_incoming_interrupt(int interrupt, struct i386_saved_state *ssp)
+PE_incoming_interrupt(int interrupt, void *eip)

 {
        boolean_t               save_int;
 {
        boolean_t               save_int;

-

        i386_interrupt_handler_t        *vector;
 
        i386_interrupt_handler_t        *vector;
 

-       vector = &PE_interrupt_handler;
+       KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_INTR, 0) | DBG_FUNC_START,
+          0, (unsigned int)eip, 0, 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);
        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);
+

 }
 
 void PE_install_interrupt_handler(void *nub, int source,
 }
 
 void PE_install_interrupt_handler(void *nub, int source,