xnu-517.3.15.tar.gz

[apple/xnu.git] / osfmk / kdp / ml / i386 / kdp_machdep.c

diff --git a/osfmk/kdp/ml/i386/kdp_machdep.c b/osfmk/kdp/ml/i386/kdp_machdep.c
index 77182fb97d93b408899c9d709b6c972d10a202bf..6211fdae976ca1335d12f8969d7fc808f5f03002 100644 (file)
--- a/osfmk/kdp/ml/i386/kdp_machdep.c
+++ b/osfmk/kdp/ml/i386/kdp_machdep.c
@@ -3,38 +3,31 @@
  *
  * @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,
- * 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@
  */
-/*
- * Copyright (c) 1997 Apple Computer, Inc.  All rights reserved.
- * Copyright (c) 1994 NeXT Computer, Inc.  All rights reserved.
- *
- * machdep/ppc/kdp_machdep.c
- *
- * Machine-dependent code for Remote Debugging Protocol
- *
- * March, 1997 Created.        Umesh Vaishampayan [umeshv@NeXT.com]
- *
- */
  
 #include <mach/mach_types.h>
 #include <mach/machine.h>
 #include <mach/exception_types.h>
 #include <i386/trap.h>
+#include <i386/mp.h>
 #include <kdp/kdp_internal.h>
 
 #define KDP_TEST_HARNESS 0
@@ -348,7 +341,7 @@ kdp_i386_backtrace(void     *_frame, int nframes)
        }
        return;
 invalid:
-       printf("invalid frame pointer %x\n",frame->prev);
+       printf("invalid frame pointer %x\n",frame);
 }
 
 void
@@ -361,6 +354,8 @@ kdp_i386_trap(
 {
     unsigned int exception, subcode = 0, code;
 
+    mp_kdp_enter();
+
     if (trapno != T_INT3 && trapno != T_DEBUG)
        printf("unexpected kernel trap %x eip %x\n", trapno, saved_state->eip);
 
@@ -427,9 +422,11 @@ kdp_i386_trap(
        break;
     }
 
-//  kdp_i386_backtrace((void *) saved_state->ebp, 10);
+//    kdp_i386_backtrace((void *) saved_state->ebp, 10);
 
     kdp_raise_exception(exception, code, subcode, saved_state);
+
+    mp_kdp_exit();
 }
 
 boolean_t 
@@ -438,3 +435,8 @@ kdp_call_kdb(
 {       
         return(FALSE);
 }
+
+unsigned int kdp_ml_get_breakinsn()
+{
+  return 0xcc;
+}