xnu-4570.1.46.tar.gz

[apple/xnu.git] / osfmk / x86_64 / locore.s

diff --git a/osfmk/x86_64/locore.s b/osfmk/x86_64/locore.s
index 8620c19fc7c1e445adbedc1c6e8e629d7302c62d..0638e5162042f405ff79f01b73b8a39ad133e67f 100644 (file)
--- a/osfmk/x86_64/locore.s
+++ b/osfmk/x86_64/locore.s
@@ -54,7 +54,7 @@
  * the rights to redistribute these changes.
  */
 
  * the rights to redistribute these changes.
  */
 

-#include <mach_rt.h>
+#include <debug.h>

 #include <mach_kdp.h>
 #include <mach_assert.h>
 
 #include <mach_kdp.h>
 #include <mach_assert.h>
 


@@ -62,6 +62,7 @@
 #include <i386/asm.h>
 #include <i386/cpuid.h>
 #include <i386/eflags.h>
 #include <i386/asm.h>
 #include <i386/cpuid.h>
 #include <i386/eflags.h>

+#include <i386/postcode.h>

 #include <i386/proc_reg.h>
 #include <i386/trap.h>
 #include <assym.s>
 #include <i386/proc_reg.h>
 #include <i386/trap.h>
 #include <assym.s>


@@ -157,14 +158,22 @@ wrmsr_fail:
        movl    $1, %eax
        ret
 
        movl    $1, %eax
        ret
 

+#if DEBUG
+.globl EXT(thread_exception_return_internal)
+#else

 .globl EXT(thread_exception_return)
 .globl EXT(thread_exception_return)

+#endif

 .globl EXT(thread_bootstrap_return)
 LEXT(thread_bootstrap_return)
 #if CONFIG_DTRACE
        call EXT(dtrace_thread_bootstrap)
 #endif
 
 .globl EXT(thread_bootstrap_return)
 LEXT(thread_bootstrap_return)
 #if CONFIG_DTRACE
        call EXT(dtrace_thread_bootstrap)
 #endif
 

+#if DEBUG
+LEXT(thread_exception_return_internal)
+#else

 LEXT(thread_exception_return)
 LEXT(thread_exception_return)

+#endif

        cli
        xorl    %ecx, %ecx              /* don't check if we're in the PFZ */
        jmp     EXT(return_from_trap)
        cli
        xorl    %ecx, %ecx              /* don't check if we're in the PFZ */
        jmp     EXT(return_from_trap)


@@ -344,3 +353,12 @@ L_copyin_word_fail:
        RECOVERY_SECTION
        RECOVER_TABLE_END
 
        RECOVERY_SECTION
        RECOVER_TABLE_END
 

+
+/*
+ * Vector here on any exception at startup prior to switching to
+ * the kernel's idle page-tables and installing the kernel master IDT.
+ */
+Entry(vstart_trap_handler)
+       POSTCODE(BOOT_TRAP_HLT)
+       hlt
+