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 4087324276574d193fd2c9f31e69802ec4ff8d14..6211fdae976ca1335d12f8969d7fc808f5f03002 100644 (file)
--- a/osfmk/kdp/ml/i386/kdp_machdep.c
+++ b/osfmk/kdp/ml/i386/kdp_machdep.c
@@ -27,6 +27,7 @@
 #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
@@ -340,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
@@ -353,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);
 
@@ -419,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