]> git.saurik.com Git - apple/xnu.git/blobdiff - osfmk/i386/AT386/model_dep.c
xnu-3789.1.32.tar.gz
[apple/xnu.git] / osfmk / i386 / AT386 / model_dep.c
index 6743dc70bf83ea8bd428a79a0aee71bfca166cf0..63daa801942fb6c51b21206e1816f4b7e7c14158 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2016 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -66,8 +66,6 @@
  *     Basic initialization for I386 - ISA bus machines.
  */
 
-#include <platforms.h>
-#include <mach_kdb.h>
 
 #include <mach/i386/vm_param.h>
 
@@ -76,6 +74,7 @@
 #include <mach/vm_prot.h>
 #include <mach/machine.h>
 #include <mach/time_value.h>
+#include <sys/kdebug.h>
 #include <kern/spl.h>
 #include <kern/assert.h>
 #include <kern/debug.h>
 #include <kern/clock.h>
 #include <kern/cpu_data.h>
 #include <kern/machine.h>
-#include <i386/fpu.h>
-#include <i386/ipl.h>
-#include <i386/misc_protos.h>
-#include <i386/mtrr.h>
-#include <i386/machine_routines.h>
-#include <i386/pmCPU.h>
 #include <i386/postcode.h>
+#include <i386/mp_desc.h>
+#include <i386/misc_protos.h>
+#include <i386/thread.h>
 #include <i386/trap.h>
+#include <i386/machine_routines.h>
 #include <i386/mp.h>           /* mp_rendezvous_break_lock */
+#include <i386/cpuid.h>
+#include <i386/fpu.h>
+#include <i386/machine_cpu.h>
+#include <i386/pmap.h>
+#if CONFIG_MTRR
+#include <i386/mtrr.h>
+#endif
+#include <i386/ucode.h>
+#include <i386/pmCPU.h>
+#include <i386/panic_hooks.h>
+
 #include <architecture/i386/pio.h> /* inb() */
 #include <pexpert/i386/boot.h>
-#if    MACH_KDB
-#include <ddb/db_aout.h>
-#endif /* MACH_KDB */
 
+#include <kdp/kdp_dyld.h>
+#include <kdp/kdp_core.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 
-#include <i386/mp_desc.h>
-#include <i386/mp.h>
-#include <i386/cpuid.h>
-
 #include <IOKit/IOPlatformExpert.h>
 #include <IOKit/IOHibernatePrivate.h>
 
 #include <pexpert/i386/efi.h>
 
 #include <kern/thread.h>
-#include <i386/thread.h>
+#include <kern/sched.h>
 #include <mach-o/loader.h>
 #include <mach-o/nlist.h>
 
-void   enable_bluebox(void);
-void   disable_bluebox(void);
+#include <libkern/kernel_mach_header.h>
+#include <libkern/OSKextLibPrivate.h>
+
+#include <mach/branch_predicates.h>
+
+#if    DEBUG
+#define DPRINTF(x...)  kprintf(x)
+#else
+#define DPRINTF(x...)
+#endif
 
 static void machine_conf(void);
+void panic_print_symbol_name(vm_address_t search);
 
-extern int             default_preemption_rate;
+extern const char      version[];
+extern char    osversion[];
 extern int             max_unsafe_quanta;
 extern int             max_poll_quanta;
 extern unsigned int    panic_is_inited;
 
+extern int     proc_pid(void *p);
+
+/* Definitions for frame pointers */
+#define FP_ALIGNMENT_MASK      ((uint32_t)(0x3))
+#define FP_LR_OFFSET           ((uint32_t)4)
+#define FP_LR_OFFSET64         ((uint32_t)8)
+#define FP_MAX_NUM_TO_EVALUATE (50)
+
 int db_run_mode;
 
 volatile int pbtcpu = -1;
 hw_lock_data_t pbtlock;                /* backtrace print lock */
 uint32_t pbtcnt = 0;
 
+volatile int panic_double_fault_cpu = -1;
+
+#define PRINT_ARGS_FROM_STACK_FRAME    0
+
 typedef struct _cframe_t {
     struct _cframe_t   *prev;
-    unsigned           caller;
+    uintptr_t          caller;
+#if PRINT_ARGS_FROM_STACK_FRAME
     unsigned           args[0];
+#endif
 } cframe_t;
 
 static unsigned panic_io_port;
 static unsigned        commit_paniclog_to_nvram;
 
+unsigned int debug_boot_arg;
+
+/*
+ * Backtrace a single frame.
+ */
+void
+print_one_backtrace(pmap_t pmap, vm_offset_t topfp, const char *cur_marker,
+       boolean_t is_64_bit, boolean_t nvram_format) 
+{
+       int                 i = 0;
+       addr64_t        lr;
+       addr64_t        fp;
+       addr64_t        fp_for_ppn;
+       ppnum_t         ppn;
+       boolean_t       dump_kernel_stack;
+
+       fp = topfp;
+       fp_for_ppn = 0;
+       ppn = (ppnum_t)NULL;
+
+       if (fp >= VM_MIN_KERNEL_ADDRESS)
+               dump_kernel_stack = TRUE;
+       else
+               dump_kernel_stack = FALSE;
+
+       do {
+               if ((fp == 0) || ((fp & FP_ALIGNMENT_MASK) != 0))
+                       break;
+               if (dump_kernel_stack && ((fp < VM_MIN_KERNEL_ADDRESS) || (fp > VM_MAX_KERNEL_ADDRESS)))
+                       break;
+               if ((!dump_kernel_stack) && (fp >=VM_MIN_KERNEL_ADDRESS))
+                       break;
+                       
+        /* Check to see if current address will result in a different
+           ppn than previously computed (to avoid recomputation) via
+           (addr) ^ fp_for_ppn) >> PAGE_SHIFT) */
+
+               if ((((fp + FP_LR_OFFSET) ^ fp_for_ppn) >> PAGE_SHIFT) != 0x0U) {
+                       ppn = pmap_find_phys(pmap, fp + FP_LR_OFFSET);
+                       fp_for_ppn = fp + (is_64_bit ? FP_LR_OFFSET64 : FP_LR_OFFSET);
+               }
+               if (ppn != (ppnum_t)NULL) {
+                       if (is_64_bit) {
+                               lr = ml_phys_read_double_64(((((vm_offset_t)ppn) << PAGE_SHIFT)) | ((fp + FP_LR_OFFSET64) & PAGE_MASK));
+                       } else {
+                               lr = ml_phys_read_word(((((vm_offset_t)ppn) << PAGE_SHIFT)) | ((fp + FP_LR_OFFSET) & PAGE_MASK));
+                       }
+               } else {
+                       if (is_64_bit) {
+                               kdb_printf("%s\t  Could not read LR from frame at 0x%016llx\n", cur_marker, fp + FP_LR_OFFSET64);
+                       } else {
+                               kdb_printf("%s\t  Could not read LR from frame at 0x%08x\n", cur_marker, (uint32_t)(fp + FP_LR_OFFSET));
+                       }
+                       break;
+               }
+               if (((fp ^ fp_for_ppn) >> PAGE_SHIFT) != 0x0U) {
+                       ppn = pmap_find_phys(pmap, fp);
+                       fp_for_ppn = fp;
+               }
+               if (ppn != (ppnum_t)NULL) {
+                       if (is_64_bit) {
+                               fp = ml_phys_read_double_64(((((vm_offset_t)ppn) << PAGE_SHIFT)) | (fp & PAGE_MASK));
+                       } else {
+                               fp = ml_phys_read_word(((((vm_offset_t)ppn) << PAGE_SHIFT)) | (fp & PAGE_MASK));
+                       }
+               } else {
+                       if (is_64_bit) {
+                               kdb_printf("%s\t  Could not read FP from frame at 0x%016llx\n", cur_marker, fp);
+                       } else {
+                               kdb_printf("%s\t  Could not read FP from frame at 0x%08x\n", cur_marker, (uint32_t)fp);
+                       }
+                       break;
+               }
+
+               if (nvram_format) {
+                       if (is_64_bit) {
+                               kdb_printf("%s\t0x%016llx\n", cur_marker, lr);
+                       } else {
+                               kdb_printf("%s\t0x%08x\n", cur_marker, (uint32_t)lr);
+                       }
+               } else {                
+                       if (is_64_bit) {
+                               kdb_printf("%s\t  lr: 0x%016llx  fp: 0x%016llx\n", cur_marker, lr, fp);
+                       } else {
+                               kdb_printf("%s\t  lr: 0x%08x  fp: 0x%08x\n", cur_marker, (uint32_t)lr, (uint32_t)fp);
+                       }
+               }
+       } while ((++i < FP_MAX_NUM_TO_EVALUATE) && (fp != topfp));
+}
 void
 machine_startup(void)
 {
@@ -152,22 +268,32 @@ machine_startup(void)
             halt_in_debugger = halt_in_debugger ? 0 : 1;
 #endif
 
-       if (PE_parse_boot_arg("debug", &boot_arg)) {
-               if (boot_arg & DB_HALT) halt_in_debugger=1;
-               if (boot_arg & DB_PRT) disable_debug_output=FALSE; 
-               if (boot_arg & DB_SLOG) systemLogDiags=TRUE; 
-               if (boot_arg & DB_NMI) panicDebugging=TRUE; 
-               if (boot_arg & DB_LOG_PI_SCRN) logPanicDataToScreen=TRUE; 
+       if (PE_parse_boot_argn("debug", &debug_boot_arg, sizeof (debug_boot_arg))) {
+               panicDebugging = TRUE;
+#if DEVELOPMENT || DEBUG
+               if (debug_boot_arg & DB_HALT) halt_in_debugger=1;
+#endif
+               if (debug_boot_arg & DB_PRT) disable_debug_output=FALSE; 
+               if (debug_boot_arg & DB_SLOG) systemLogDiags=TRUE; 
+               if (debug_boot_arg & DB_LOG_PI_SCRN) logPanicDataToScreen=TRUE;
+#if KDEBUG_MOJO_TRACE
+               if (debug_boot_arg & DB_PRT_KDEBUG) {
+                       kdebug_serial = TRUE;
+                       disable_debug_output = FALSE;
+               }
+#endif
+       } else {
+               debug_boot_arg = 0;
        }
 
-       if (!PE_parse_boot_arg("nvram_paniclog", &commit_paniclog_to_nvram))
+       if (!PE_parse_boot_argn("nvram_paniclog", &commit_paniclog_to_nvram, sizeof (commit_paniclog_to_nvram)))
                commit_paniclog_to_nvram = 1;
 
        /*
         * Entering the debugger will put the CPUs into a "safe"
         * power mode.
         */
-       if (PE_parse_boot_arg("pmsafe_debug", &boot_arg))
+       if (PE_parse_boot_argn("pmsafe_debug", &boot_arg, sizeof (boot_arg)))
            pmsafe_debug = boot_arg;
 
 #if NOTYET
@@ -175,58 +301,29 @@ machine_startup(void)
 #endif
        hw_lock_init(&pbtlock);         /* initialize print backtrace lock */
 
-#if    MACH_KDB
-       /*
-        * Initialize KDB
-        */
-#if    DB_MACHINE_COMMANDS
-       db_machine_commands_install(ppc_db_commands);
-#endif /* DB_MACHINE_COMMANDS */
-       ddb_init();
-
-       if (boot_arg & DB_KDB)
-               current_debugger = KDB_CUR_DB;
-
-       /*
-        * Cause a breakpoint trap to the debugger before proceeding
-        * any further if the proper option bit was specified in
-        * the boot flags.
-        */
-       if (halt_in_debugger && (current_debugger == KDB_CUR_DB)) {
-               Debugger("inline call to debugger(machine_startup)");
-               halt_in_debugger = 0;
-               active_debugger =1;
-       }
-#endif /* MACH_KDB */
-
-       if (PE_parse_boot_arg("preempt", &boot_arg)) {
+       if (PE_parse_boot_argn("preempt", &boot_arg, sizeof (boot_arg))) {
                default_preemption_rate = boot_arg;
        }
-       if (PE_parse_boot_arg("unsafe", &boot_arg)) {
+       if (PE_parse_boot_argn("unsafe", &boot_arg, sizeof (boot_arg))) {
                max_unsafe_quanta = boot_arg;
        }
-       if (PE_parse_boot_arg("poll", &boot_arg)) {
+       if (PE_parse_boot_argn("poll", &boot_arg, sizeof (boot_arg))) {
                max_poll_quanta = boot_arg;
        }
-       if (PE_parse_boot_arg("yield", &boot_arg)) {
+       if (PE_parse_boot_argn("yield", &boot_arg, sizeof (boot_arg))) {
                sched_poll_yield_shift = boot_arg;
        }
-       if (PE_parse_boot_arg("idlehalt", &boot_arg)) {
-               idlehalt = boot_arg;
-       }
 /* The I/O port to issue a read from, in the event of a panic. Useful for
  * triggering logic analyzers.
  */
-       if (PE_parse_boot_arg("panic_io_port", &boot_arg)) {
+       if (PE_parse_boot_argn("panic_io_port", &boot_arg, sizeof (boot_arg))) {
                /*I/O ports range from 0 through 0xFFFF */
                panic_io_port = boot_arg & 0xffff;
        }
 
        machine_conf();
 
-#if NOTYET
-       ml_thrm_init();         /* Start thermal monitoring on this processor */
-#endif
+       panic_hooks_init();
 
        /*
         * Start the system.
@@ -239,7 +336,7 @@ machine_startup(void)
 static void
 machine_conf(void)
 {
-       machine_info.memory_size = mem_size;
+       machine_info.memory_size = (typeof(machine_info.memory_size))mem_size;
 }
 
 
@@ -355,8 +452,14 @@ efi_set_tables_64(EFI_SYSTEM_TABLE_64 * system_table)
     uint32_t hdr_cksum;
     uint32_t cksum;
 
-    kprintf("Processing 64-bit EFI tables at %p\n", system_table);
+    DPRINTF("Processing 64-bit EFI tables at %p\n", system_table);
     do {
+       DPRINTF("Header:\n");
+       DPRINTF("  Signature:   0x%016llx\n", system_table->Hdr.Signature);
+       DPRINTF("  Revision:    0x%08x\n", system_table->Hdr.Revision);
+       DPRINTF("  HeaderSize:  0x%08x\n", system_table->Hdr.HeaderSize);
+       DPRINTF("  CRC32:       0x%08x\n", system_table->Hdr.CRC32);
+       DPRINTF("RuntimeServices: 0x%016llx\n", system_table->RuntimeServices);
         if (system_table->Hdr.Signature != EFI_SYSTEM_TABLE_SIGNATURE) {
            kprintf("Bad EFI system table signature\n");
             break;
@@ -366,29 +469,34 @@ efi_set_tables_64(EFI_SYSTEM_TABLE_64 * system_table)
         system_table->Hdr.CRC32 = 0;
         cksum = crc32(0L, system_table, system_table->Hdr.HeaderSize);
 
-        //kprintf("System table calculated CRC32 = 0x%x, header = 0x%x\n", cksum, hdr_cksum);
+        DPRINTF("System table calculated CRC32 = 0x%x, header = 0x%x\n", cksum, hdr_cksum);
         system_table->Hdr.CRC32 = hdr_cksum;
         if (cksum != hdr_cksum) {
             kprintf("Bad EFI system table checksum\n");
             break;
         }
 
-       gPEEFISystemTable     = system_table;
+        gPEEFISystemTable     = system_table;
 
-        kprintf("RuntimeServices table at 0x%qx\n", system_table->RuntimeServices);
-        runtime = (EFI_RUNTIME_SERVICES_64 *) (uintptr_t)system_table->RuntimeServices; // XXX
-        kprintf("Checking runtime services table %p\n", runtime);
-       if (runtime->Hdr.Signature != EFI_RUNTIME_SERVICES_SIGNATURE) {
-           kprintf("Bad EFI runtime table signature\n");
-           break;
-       }
+        if(system_table->RuntimeServices == 0) {
+            kprintf("No runtime table present\n");
+            break;
+        }
+        DPRINTF("RuntimeServices table at 0x%qx\n", system_table->RuntimeServices);
+        // 64-bit virtual address is OK for 64-bit EFI and 64/32-bit kernel.
+        runtime = (EFI_RUNTIME_SERVICES_64 *) (uintptr_t)system_table->RuntimeServices;
+        DPRINTF("Checking runtime services table %p\n", runtime);
+        if (runtime->Hdr.Signature != EFI_RUNTIME_SERVICES_SIGNATURE) {
+            kprintf("Bad EFI runtime table signature\n");
+            break;
+        }
 
        // Verify signature of runtime services table
        hdr_cksum = runtime->Hdr.CRC32;
        runtime->Hdr.CRC32 = 0;
        cksum = crc32(0L, runtime, runtime->Hdr.HeaderSize);
 
-       //kprintf("Runtime table calculated CRC32 = 0x%x, header = 0x%x\n", cksum, hdr_cksum);
+       DPRINTF("Runtime table calculated CRC32 = 0x%x, header = 0x%x\n", cksum, hdr_cksum);
        runtime->Hdr.CRC32 = hdr_cksum;
        if (cksum != hdr_cksum) {
            kprintf("Bad EFI runtime table checksum\n");
@@ -401,51 +509,79 @@ efi_set_tables_64(EFI_SYSTEM_TABLE_64 * system_table)
 }
 
 static void
-efi_set_tables_32(EFI_SYSTEM_TABLE * system_table)
+efi_set_tables_32(EFI_SYSTEM_TABLE_32 * system_table)
 {
-    EFI_RUNTIME_SERVICES *runtime;
+    EFI_RUNTIME_SERVICES_32 *runtime;
     uint32_t hdr_cksum;
     uint32_t cksum;
 
-    kprintf("Processing 32-bit EFI tables at %p\n", system_table);
+    DPRINTF("Processing 32-bit EFI tables at %p\n", system_table);
     do {
+       DPRINTF("Header:\n");
+       DPRINTF("  Signature:   0x%016llx\n", system_table->Hdr.Signature);
+       DPRINTF("  Revision:    0x%08x\n", system_table->Hdr.Revision);
+       DPRINTF("  HeaderSize:  0x%08x\n", system_table->Hdr.HeaderSize);
+       DPRINTF("  CRC32:       0x%08x\n", system_table->Hdr.CRC32);
+       DPRINTF("RuntimeServices: 0x%08x\n", system_table->RuntimeServices);
         if (system_table->Hdr.Signature != EFI_SYSTEM_TABLE_SIGNATURE) {
-           kprintf("Bad EFI system table signature\n");
+            kprintf("Bad EFI system table signature\n");
             break;
         }
         // Verify signature of the system table
         hdr_cksum = system_table->Hdr.CRC32;
         system_table->Hdr.CRC32 = 0;
+        DPRINTF("System table at %p HeaderSize 0x%x\n", system_table, system_table->Hdr.HeaderSize);
         cksum = crc32(0L, system_table, system_table->Hdr.HeaderSize);
 
-        //kprintf("System table calculated CRC32 = 0x%x, header = 0x%x\n", cksum, hdr_cksum);
+        DPRINTF("System table calculated CRC32 = 0x%x, header = 0x%x\n", cksum, hdr_cksum);
         system_table->Hdr.CRC32 = hdr_cksum;
         if (cksum != hdr_cksum) {
             kprintf("Bad EFI system table checksum\n");
             break;
         }
 
-       gPEEFISystemTable     = system_table;
+        gPEEFISystemTable     = system_table;
 
-       kprintf("RuntimeServices table at %p\n", system_table->RuntimeServices);
-        runtime = (EFI_RUNTIME_SERVICES *) system_table->RuntimeServices;
-       if (runtime->Hdr.Signature != EFI_RUNTIME_SERVICES_SIGNATURE) {
-           kprintf("Bad EFI runtime table signature\n");
-           break;
-       }
+        if(system_table->RuntimeServices == 0) {
+            kprintf("No runtime table present\n");
+            break;
+        }
+        DPRINTF("RuntimeServices table at 0x%x\n", system_table->RuntimeServices);
+        // 32-bit virtual address is OK for 32-bit EFI and 32-bit kernel.
+        // For a 64-bit kernel, booter provides a virtual address mod 4G
+        runtime = (EFI_RUNTIME_SERVICES_32 *)
+                       (system_table->RuntimeServices | VM_MIN_KERNEL_ADDRESS);
+       DPRINTF("Runtime table addressed at %p\n", runtime);
+        if (runtime->Hdr.Signature != EFI_RUNTIME_SERVICES_SIGNATURE) {
+            kprintf("Bad EFI runtime table signature\n");
+            break;
+        }
 
        // Verify signature of runtime services table
        hdr_cksum = runtime->Hdr.CRC32;
        runtime->Hdr.CRC32 = 0;
        cksum = crc32(0L, runtime, runtime->Hdr.HeaderSize);
 
-       //kprintf("Runtime table calculated CRC32 = 0x%x, header = 0x%x\n", cksum, hdr_cksum);
+       DPRINTF("Runtime table calculated CRC32 = 0x%x, header = 0x%x\n", cksum, hdr_cksum);
        runtime->Hdr.CRC32 = hdr_cksum;
        if (cksum != hdr_cksum) {
            kprintf("Bad EFI runtime table checksum\n");
            break;
        }
 
+       DPRINTF("Runtime functions\n");
+       DPRINTF("  GetTime                  : 0x%x\n", runtime->GetTime);
+       DPRINTF("  SetTime                  : 0x%x\n", runtime->SetTime);
+       DPRINTF("  GetWakeupTime            : 0x%x\n", runtime->GetWakeupTime);
+       DPRINTF("  SetWakeupTime            : 0x%x\n", runtime->SetWakeupTime);
+       DPRINTF("  SetVirtualAddressMap     : 0x%x\n", runtime->SetVirtualAddressMap);
+       DPRINTF("  ConvertPointer           : 0x%x\n", runtime->ConvertPointer);
+       DPRINTF("  GetVariable              : 0x%x\n", runtime->GetVariable);
+       DPRINTF("  GetNextVariableName      : 0x%x\n", runtime->GetNextVariableName);
+       DPRINTF("  SetVariable              : 0x%x\n", runtime->SetVariable);
+       DPRINTF("  GetNextHighMonotonicCount: 0x%x\n", runtime->GetNextHighMonotonicCount);
+       DPRINTF("  ResetSystem              : 0x%x\n", runtime->ResetSystem);
+
        gPEEFIRuntimeServices = runtime;
     }
     while (FALSE);
@@ -471,26 +607,46 @@ efi_init(void)
        msize = args->MemoryMapDescriptorSize;
        mcount = args->MemoryMapSize / msize;
 
-       mptr = (EfiMemoryRange *)args->MemoryMap;
+       DPRINTF("efi_init() kernel base: 0x%x size: 0x%x\n",
+               args->kaddr, args->ksize);
+       DPRINTF("           efiSystemTable physical: 0x%x virtual: %p\n",
+               args->efiSystemTable,
+               (void *) ml_static_ptovirt(args->efiSystemTable));
+       DPRINTF("           efiRuntimeServicesPageStart: 0x%x\n",
+               args->efiRuntimeServicesPageStart);
+       DPRINTF("           efiRuntimeServicesPageCount: 0x%x\n",
+               args->efiRuntimeServicesPageCount);
+       DPRINTF("           efiRuntimeServicesVirtualPageStart: 0x%016llx\n",
+               args->efiRuntimeServicesVirtualPageStart);
+       mptr = (EfiMemoryRange *)ml_static_ptovirt(args->MemoryMap);
        for (i=0; i < mcount; i++, mptr = (EfiMemoryRange *)(((vm_offset_t)mptr) + msize)) {
            if (((mptr->Attribute & EFI_MEMORY_RUNTIME) == EFI_MEMORY_RUNTIME) ) {
-               vm_size = i386_ptob((uint32_t)mptr->NumberOfPages);
+               vm_size = (vm_offset_t)i386_ptob((uint32_t)mptr->NumberOfPages);
                vm_addr =   (vm_offset_t) mptr->VirtualStart;
+               /* For K64 on EFI32, shadow-map into high KVA */
+               if (vm_addr < VM_MIN_KERNEL_ADDRESS)
+                       vm_addr |= VM_MIN_KERNEL_ADDRESS;
                phys_addr = (vm_map_offset_t) mptr->PhysicalStart;
-               pmap_map(vm_addr, phys_addr, phys_addr + round_page(vm_size),
+               DPRINTF(" Type: %x phys: %p EFIv: %p kv: %p size: %p\n",
+                       mptr->Type,
+                       (void *) (uintptr_t) phys_addr,
+                       (void *) (uintptr_t) mptr->VirtualStart,
+                       (void *) vm_addr,
+                       (void *) vm_size);
+               pmap_map_bd(vm_addr, phys_addr, phys_addr + round_page(vm_size),
                     (mptr->Type == kEfiRuntimeServicesCode) ? VM_PROT_READ | VM_PROT_EXECUTE : VM_PROT_READ|VM_PROT_WRITE,
                     (mptr->Type == EfiMemoryMappedIO)       ? VM_WIMG_IO   : VM_WIMG_USE_DEFAULT);
            }
        }
 
-        if (args->Version > 1)
-                panic("Incompatible boot args version %d\n", args->Version);
+        if (args->Version != kBootArgsVersion2)
+            panic("Incompatible boot args version %d revision %d\n", args->Version, args->Revision);
 
-        kprintf("Boot args version %d revision %d mode %d\n", args->Version, args->Revision, args->efiMode);
-        if (args->Revision >= 4 && args->efiMode == kBootArgsEfiMode64) {
-                efi_set_tables_64((EFI_SYSTEM_TABLE_64 *) args->efiSystemTable);
+       DPRINTF("Boot args version %d revision %d mode %d\n", args->Version, args->Revision, args->efiMode);
+        if (args->efiMode == kBootArgsEfiMode64) {
+            efi_set_tables_64((EFI_SYSTEM_TABLE_64 *) ml_static_ptovirt(args->efiSystemTable));
         } else {
-                efi_set_tables_32((EFI_SYSTEM_TABLE *) args->efiSystemTable);
+            efi_set_tables_32((EFI_SYSTEM_TABLE_32 *) ml_static_ptovirt(args->efiSystemTable));
         }
     }
     while (FALSE);
@@ -506,8 +662,6 @@ hibernate_newruntime_map(void * map, vm_size_t map_size, uint32_t system_table_o
 
     kprintf("Reinitializing EFI runtime services\n");
 
-    if (args->Revision < 3)
-       return;
     do
     {
         vm_offset_t vm_size, vm_addr;
@@ -529,15 +683,18 @@ hibernate_newruntime_map(void * map, vm_size_t map_size, uint32_t system_table_o
        kprintf("Old map:\n");
        msize = args->MemoryMapDescriptorSize;
        mcount = args->MemoryMapSize / msize;
-       mptr = (EfiMemoryRange *)args->MemoryMap;
+       mptr = (EfiMemoryRange *)ml_static_ptovirt(args->MemoryMap);
        for (i=0; i < mcount; i++, mptr = (EfiMemoryRange *)(((vm_offset_t)mptr) + msize)) {
            if ((mptr->Attribute & EFI_MEMORY_RUNTIME) == EFI_MEMORY_RUNTIME) {
 
-               vm_size = i386_ptob((uint32_t)mptr->NumberOfPages);
+               vm_size = (vm_offset_t)i386_ptob((uint32_t)mptr->NumberOfPages);
                vm_addr =   (vm_offset_t) mptr->VirtualStart;
+               /* K64 on EFI32 */
+               if (vm_addr < VM_MIN_KERNEL_ADDRESS)
+                       vm_addr |= VM_MIN_KERNEL_ADDRESS;
                phys_addr = (vm_map_offset_t) mptr->PhysicalStart;
 
-               kprintf("mapping[%u] %qx @ %x, %llu\n", mptr->Type, phys_addr, vm_addr, mptr->NumberOfPages);
+               kprintf("mapping[%u] %qx @ %lx, %llu\n", mptr->Type, phys_addr, (unsigned long)vm_addr, mptr->NumberOfPages);
            }
        }
 
@@ -546,16 +703,18 @@ hibernate_newruntime_map(void * map, vm_size_t map_size, uint32_t system_table_o
 
        kprintf("New map:\n");
        msize = args->MemoryMapDescriptorSize;
-       mcount = map_size / msize;
+       mcount = (unsigned int )(map_size / msize);
        mptr = map;
        for (i=0; i < mcount; i++, mptr = (EfiMemoryRange *)(((vm_offset_t)mptr) + msize)) {
            if ((mptr->Attribute & EFI_MEMORY_RUNTIME) == EFI_MEMORY_RUNTIME) {
 
-               vm_size = i386_ptob((uint32_t)mptr->NumberOfPages);
+               vm_size = (vm_offset_t)i386_ptob((uint32_t)mptr->NumberOfPages);
                vm_addr =   (vm_offset_t) mptr->VirtualStart;
+               if (vm_addr < VM_MIN_KERNEL_ADDRESS)
+                       vm_addr |= VM_MIN_KERNEL_ADDRESS;
                phys_addr = (vm_map_offset_t) mptr->PhysicalStart;
 
-               kprintf("mapping[%u] %qx @ %x, %llu\n", mptr->Type, phys_addr, vm_addr, mptr->NumberOfPages);
+               kprintf("mapping[%u] %qx @ %lx, %llu\n", mptr->Type, phys_addr, (unsigned long)vm_addr, mptr->NumberOfPages);
 
                pmap_map(vm_addr, phys_addr, phys_addr + round_page(vm_size),
                         (mptr->Type == kEfiRuntimeServicesCode) ? VM_PROT_READ | VM_PROT_EXECUTE : VM_PROT_READ|VM_PROT_WRITE,
@@ -563,14 +722,14 @@ hibernate_newruntime_map(void * map, vm_size_t map_size, uint32_t system_table_o
            }
        }
 
-        if (args->Version > 1)
-                panic("Incompatible boot args version %d\n", args->Version);
+        if (args->Version != kBootArgsVersion2)
+            panic("Incompatible boot args version %d revision %d\n", args->Version, args->Revision);
 
         kprintf("Boot args version %d revision %d mode %d\n", args->Version, args->Revision, args->efiMode);
-        if (args->Revision >= 4 && args->efiMode == kBootArgsEfiMode64) {
-                efi_set_tables_64((EFI_SYSTEM_TABLE_64 *) args->efiSystemTable);
+        if (args->efiMode == kBootArgsEfiMode64) {
+           efi_set_tables_64((EFI_SYSTEM_TABLE_64 *) ml_static_ptovirt(args->efiSystemTable));
         } else {
-                efi_set_tables_32((EFI_SYSTEM_TABLE *) args->efiSystemTable);
+           efi_set_tables_32((EFI_SYSTEM_TABLE_32 *) ml_static_ptovirt(args->efiSystemTable));
         }
     }
     while (FALSE);
@@ -586,6 +745,9 @@ hibernate_newruntime_map(void * map, vm_size_t map_size, uint32_t system_table_o
 void
 machine_init(void)
 {
+       /* Now with VM up, switch to dynamically allocated cpu data */
+       cpu_data_realloc();
+
         /* Ensure panic buffer is initialized. */
         debug_log_init();
 
@@ -613,6 +775,7 @@ machine_init(void)
         */
        clock_config();
 
+#if CONFIG_MTRR
        /*
         * Initialize MTRR from boot processor.
         */
@@ -622,11 +785,12 @@ machine_init(void)
         * Set up PAT for boot processor.
         */
        pat_init();
+#endif
 
        /*
-        * Free lowmem pages
+        * Free lowmem pages and complete other setup
         */
-       x86_lowmem_free();
+       pmap_lowmem_finalize();
 }
 
 /*
@@ -643,6 +807,7 @@ int reset_mem_on_reboot = 1;
 /*
  * Halt the system or reboot.
  */
+__attribute__((noreturn))
 void
 halt_all_cpus(boolean_t reboot)
 {
@@ -670,13 +835,63 @@ panic_io_port_read(void) {
 /* For use with the MP rendezvous mechanism
  */
 
-#if !CONFIG_EMBEDDED
+uint64_t panic_restart_timeout = ~(0ULL);
+
+#define PANIC_RESTART_TIMEOUT (3ULL * NSEC_PER_SEC)
+
 static void
-machine_halt_cpu(__unused void *arg) {
+machine_halt_cpu(void) {
+       uint64_t deadline;
+
        panic_io_port_read();
+
+       /* Halt here forever if we're not rebooting */
+       if (!PE_reboot_on_panic() && panic_restart_timeout == ~(0ULL)) {
+               pmCPUHalt(PM_HALT_DEBUG);
+               return;
+       }
+
+       if (PE_reboot_on_panic())
+               deadline = mach_absolute_time() + PANIC_RESTART_TIMEOUT;
+       else
+               deadline = mach_absolute_time() + panic_restart_timeout;
+
+       while (mach_absolute_time() < deadline)
+               cpu_pause();
+
+       kprintf("Invoking PE_halt_restart\n");
+       /* Attempt restart via ACPI RESET_REG; at the time of this
+        * writing, this is routine is chained through AppleSMC->
+        * AppleACPIPlatform
+        */
+       if (PE_halt_restart)
+               (*PE_halt_restart)(kPERestartCPU);
        pmCPUHalt(PM_HALT_DEBUG);
 }
-#endif
+
+static int pid_from_task(task_t task)
+{
+        int pid = -1;
+
+        if (task->bsd_info)
+                pid = proc_pid(task->bsd_info);
+
+        return pid;
+}
+
+void
+DebuggerWithContext(
+       __unused unsigned int   reason,
+       __unused void           *ctx,
+       const char              *message,
+       uint64_t                debugger_options_mask)
+{
+       if (debugger_options_mask != DEBUGGER_OPTION_NONE) {
+               kprintf("debugger options (%llx) not supported for desktop.\n", debugger_options_mask);
+       }
+
+       Debugger(message);
+}
 
 void
 Debugger(
@@ -684,6 +899,9 @@ Debugger(
 {
        unsigned long pi_size = 0;
        void *stackptr;
+       int cn = cpu_number();
+
+       boolean_t old_doprnt_hide_pointers = doprnt_hide_pointers;
 
        hw_atomic_add(&debug_mode, 1);   
        if (!panic_is_inited) {
@@ -691,6 +909,7 @@ Debugger(
                asm("hlt");
        }
 
+       doprnt_hide_pointers = FALSE;
 
        printf("Debugger called: <%s>\n", message);
        kprintf("Debugger called: <%s>\n", message);
@@ -711,10 +930,15 @@ Debugger(
                panic_io_port_read();
 
                /* Obtain current frame pointer */
-               __asm__ volatile("movl %%ebp, %0" : "=m" (stackptr));
+               __asm__ volatile("movq %%rbp, %0" : "=m" (stackptr));
 
                /* Print backtrace - callee is internally synchronized */
-               panic_i386_backtrace(stackptr, 16);
+               if (strncmp(panicstr, LAUNCHD_CRASHED_PREFIX, strlen(LAUNCHD_CRASHED_PREFIX)) == 0) {
+                       /* Special handling of launchd died panics */
+                       print_launchd_info();
+               } else {
+                       panic_i386_backtrace(stackptr, ((panic_double_fault_cpu == cn) ? 80: 48), NULL, FALSE, NULL);
+               }
 
                /* everything should be printed now so copy to NVRAM
                 */
@@ -725,8 +949,9 @@ Debugger(
                   */
                    if (commit_paniclog_to_nvram) {
                        unsigned int bufpos;
-
-                        debug_putc(0);
+                       uintptr_t cr0;
+                       
+                       debug_putc(0);
 
                        /* Now call the compressor */
                        /* XXX Consider using the WKdm compressor in the
@@ -748,9 +973,20 @@ Debugger(
                         * This call must save data synchronously,
                         * since we can subsequently halt the system.
                         */
+
+
+/* The following sequence is a workaround for:
+ * <rdar://problem/5915669> SnowLeopard10A67: AppleEFINVRAM should not invoke
+ * any routines that use floating point (MMX in this case) when saving panic
+ * logs to nvram/flash.
+ */
+                       cr0 = get_cr0();
+                       clear_ts();
+
                        kprintf("Attempting to commit panic log to NVRAM\n");
-                        pi_size = PESavePanicInfo((unsigned char *)debug_buf,
-                           pi_size );
+                       pi_size = PESavePanicInfo((unsigned char *)debug_buf,
+                                       (uint32_t)pi_size );
+                       set_cr0(cr0);
 
                        /* Uncompress in-place, to permit examination of
                         * the panic log by debuggers.
@@ -761,41 +997,34 @@ Debugger(
                        }
                     }
                 }
-               draw_panic_dialog();
 
-               if (!panicDebugging) {
+               if (!panicDebugging && !kdp_has_polled_corefile()) {
+                       unsigned cnum;
                        /* Clear the MP rendezvous function lock, in the event
                         * that a panic occurred while in that codepath.
                         */
                        mp_rendezvous_break_lock();
-#if CONFIG_EMBEDDED
-                       PEHaltRestart(kPEPanicRestartCPU);
-#else
-                       /* Force all CPUs to disable interrupts and HLT.
-                        * We've panicked, and shouldn't depend on the
-                        * PEHaltRestart() mechanism, which relies on several
-                        * bits of infrastructure.
+
+                       /* Non-maskably interrupt all other processors
+                        * If a restart timeout is specified, this processor
+                        * will attempt a restart.
                         */
-                       mp_rendezvous_no_intrs(machine_halt_cpu, NULL);
-#endif
+                       kprintf("Invoking machine_halt_cpu on CPU %d\n", cn);
+                       for (cnum = 0; cnum < real_ncpus; cnum++) {
+                               if (cnum != (unsigned) cn) {
+                                       cpu_NMI_interrupt(cnum);
+                               }
+                       }
+                       machine_halt_cpu();
                        /* NOT REACHED */
                }
         }
 
+       doprnt_hide_pointers = old_doprnt_hide_pointers;
        __asm__("int3");
        hw_atomic_sub(&debug_mode, 1);   
 }
 
-void
-enable_bluebox(void)
-{
-}
-
-void
-disable_bluebox(void)
-{
-}
-
 char *
 machine_boot_info(char *buf, __unused vm_size_t size)
 {
@@ -803,44 +1032,27 @@ machine_boot_info(char *buf, __unused vm_size_t size)
        return buf;
 }
 
-
-struct pasc {
-    unsigned a: 7;
-    unsigned b: 7;
-    unsigned c: 7;
-    unsigned d: 7;
-    unsigned e: 7;
-    unsigned f: 7;
-    unsigned g: 7;
-    unsigned h: 7;
-}  __attribute__((packed));
-
-typedef struct pasc pasc_t;
-
 /* Routines for address - symbol translation. Not called unless the "keepsyms"
  * boot-arg is supplied.
  */
 
 static int
-panic_print_macho_symbol_name(struct mach_header *mh, vm_address_t search)
+panic_print_macho_symbol_name(kernel_mach_header_t *mh, vm_address_t search, const char *module_name)
 {
-    struct nlist                       *sym = NULL;
+    kernel_nlist_t     *sym = NULL;
     struct load_command                *cmd;
-    struct segment_command     *orig_ts = NULL, *orig_le = NULL;
+    kernel_segment_command_t   *orig_ts = NULL, *orig_le = NULL;
     struct symtab_command      *orig_st = NULL;
     unsigned int                       i;
     char                                       *strings, *bestsym = NULL;
     vm_address_t                       bestaddr = 0, diff, curdiff;
-    
-    if (mh->magic != MH_MAGIC) {
-        /* bad magic number */
-        return 0;
-    }
+
+    /* Assume that if it's loaded and linked into the kernel, it's a valid Mach-O */
     
     cmd = (struct load_command *) &mh[1];
     for (i = 0; i < mh->ncmds; i++) {
-        if (cmd->cmd == LC_SEGMENT) {
-            struct segment_command *orig_sg = (struct segment_command *) cmd;
+        if (cmd->cmd == LC_SEGMENT_KERNEL) {
+            kernel_segment_command_t *orig_sg = (kernel_segment_command_t *) cmd;
             
             if (strncmp(SEG_TEXT, orig_sg->segname,
                                    sizeof(orig_sg->segname)) == 0)
@@ -850,34 +1062,30 @@ panic_print_macho_symbol_name(struct mach_header *mh, vm_address_t search)
                 orig_le = orig_sg;
             else if (strncmp("", orig_sg->segname,
                                    sizeof(orig_sg->segname)) == 0)
-                orig_ts = orig_sg; /* kexts have a single unnamed segment */
+                orig_ts = orig_sg; /* pre-Lion i386 kexts have a single unnamed segment */
         }
         else if (cmd->cmd == LC_SYMTAB)
             orig_st = (struct symtab_command *) cmd;
         
-        cmd = (struct load_command *) ((caddr_t) cmd + cmd->cmdsize);
+        cmd = (struct load_command *) ((uintptr_t) cmd + cmd->cmdsize);
     }
     
     if ((orig_ts == NULL) || (orig_st == NULL) || (orig_le == NULL))
         return 0;
     
-    /* kexts don't have a LINKEDIT segment for now, so we'll never get this far for kexts */
-    
-    vm_address_t slide = ((vm_address_t)mh) - orig_ts->vmaddr;
-    if (slide != 0)
-        search -= slide; /* adjusting search since the binary has slid */
-    
     if ((search < orig_ts->vmaddr) ||
         (search >= orig_ts->vmaddr + orig_ts->vmsize)) {
         /* search out of range for this mach header */
         return 0;
     }
     
-    sym = (struct nlist *)orig_le->vmaddr;
-    strings = ((char *)sym) + orig_st->nsyms * sizeof(struct nlist);
+    sym = (kernel_nlist_t *)(uintptr_t)(orig_le->vmaddr + orig_st->symoff - orig_le->fileoff);
+    strings = (char *)(uintptr_t)(orig_le->vmaddr + orig_st->stroff - orig_le->fileoff);
     diff = search;
     
     for (i = 0; i < orig_st->nsyms; i++) {
+        if (sym[i].n_type & N_STAB) continue;
+
         if (sym[i].n_value <= search) {
             curdiff = search - (vm_address_t)sym[i].n_value;
             if (curdiff < diff) {
@@ -890,9 +1098,9 @@ panic_print_macho_symbol_name(struct mach_header *mh, vm_address_t search)
     
     if (bestsym != NULL) {
         if (diff != 0) {
-            kdb_printf("%s + 0x%08x \n", bestsym, diff);
+            kdb_printf("%s : %s + 0x%lx", module_name, bestsym, (unsigned long)diff);
         } else {
-            kdb_printf("%s \n", bestsym);
+            kdb_printf("%s : %s", module_name, bestsym);
         }
         return 1;
     }
@@ -904,27 +1112,30 @@ extern kmod_info_t * kmod; /* the list of modules */
 static void
 panic_print_kmod_symbol_name(vm_address_t search)
 {
-    kmod_info_t *                      current_kmod = kmod;
-    
-    while (current_kmod != NULL) {
-        if ((current_kmod->address <= search) &&
-            (current_kmod->address + current_kmod->size > search))
+    u_int i;
+
+    if (gLoadedKextSummaries == NULL)
+           return;
+    for (i = 0; i < gLoadedKextSummaries->numSummaries; ++i) {
+        OSKextLoadedKextSummary *summary = gLoadedKextSummaries->summaries + i;
+
+        if ((search >= summary->address) &&
+            (search < (summary->address + summary->size)))
+        {
+            kernel_mach_header_t *header = (kernel_mach_header_t *)(uintptr_t) summary->address;
+            if (panic_print_macho_symbol_name(header, search, summary->name) == 0) {
+                kdb_printf("%s + %llu", summary->name, (unsigned long)search - summary->address);
+            }
             break;
-        current_kmod = current_kmod->next;
-    }
-    if (current_kmod != NULL) {
-        /* if kexts had symbol table loaded, we'd call search_symbol_name again; alas, they don't */
-        kdb_printf("%s + %d \n", current_kmod->name, search - current_kmod->address);
+        }
     }
 }
 
-extern struct mach_header _mh_execute_header; /* the kernel's mach header */
-
-static void
+void
 panic_print_symbol_name(vm_address_t search)
 {
     /* try searching in the kernel */
-    if (panic_print_macho_symbol_name(&_mh_execute_header, search) == 0) {
+    if (panic_print_macho_symbol_name(&_mh_execute_header, search, "mach_kernel") == 0) {
         /* that failed, now try to search for the right kext */
         panic_print_kmod_symbol_name(search);
     }
@@ -939,28 +1150,64 @@ panic_print_symbol_name(vm_address_t search)
 #define DUMPFRAMES 32
 #define PBT_TIMEOUT_CYCLES (5 * 1000 * 1000 * 1000ULL)
 void
-panic_i386_backtrace(void *_frame, int nframes)
+panic_i386_backtrace(void *_frame, int nframes, const char *msg, boolean_t regdump, x86_saved_state_t *regs)
 {
        cframe_t        *frame = (cframe_t *)_frame;
        vm_offset_t raddrs[DUMPFRAMES];
+       vm_offset_t PC = 0;
        int frame_index;
        volatile uint32_t *ppbtcnt = &pbtcnt;
        uint64_t bt_tsc_timeout;
        boolean_t keepsyms = FALSE;
+       int cn = cpu_number();
+       boolean_t old_doprnt_hide_pointers = doprnt_hide_pointers;
 
-       if(pbtcpu != cpu_number()) {
+       if(pbtcpu != cn) {
                hw_atomic_add(&pbtcnt, 1);
                /* Spin on print backtrace lock, which serializes output
                 * Continue anyway if a timeout occurs.
                 */
-               hw_lock_to(&pbtlock, LockTimeOutTSC);
-               pbtcpu = cpu_number();
+               hw_lock_to(&pbtlock, ~0U);
+               pbtcpu = cn;
+       }
+
+       if (__improbable(doprnt_hide_pointers == TRUE)) {
+               /* If we're called directly, the Debugger() function will not be called,
+                * so we need to reset the value in here. */
+               doprnt_hide_pointers = FALSE;
        }
 
-       PE_parse_boot_arg("keepsyms", &keepsyms);
+       panic_check_hook();
+
+       PE_parse_boot_argn("keepsyms", &keepsyms, sizeof (keepsyms));
 
-       kdb_printf("Backtrace, "
-           "Format - Frame : Return Address (4 potential args on stack) \n");
+       if (msg != NULL) {
+               kdb_printf("%s", msg);
+       }
+
+       if ((regdump == TRUE) && (regs != NULL)) {
+               x86_saved_state64_t     *ss64p = saved_state64(regs);
+               kdb_printf(
+                   "RAX: 0x%016llx, RBX: 0x%016llx, RCX: 0x%016llx, RDX: 0x%016llx\n"
+                   "RSP: 0x%016llx, RBP: 0x%016llx, RSI: 0x%016llx, RDI: 0x%016llx\n"
+                   "R8:  0x%016llx, R9:  0x%016llx, R10: 0x%016llx, R11: 0x%016llx\n"
+                   "R12: 0x%016llx, R13: 0x%016llx, R14: 0x%016llx, R15: 0x%016llx\n"
+                   "RFL: 0x%016llx, RIP: 0x%016llx, CS:  0x%016llx, SS:  0x%016llx\n",
+                   ss64p->rax, ss64p->rbx, ss64p->rcx, ss64p->rdx,
+                   ss64p->isf.rsp, ss64p->rbp, ss64p->rsi, ss64p->rdi,
+                   ss64p->r8,  ss64p->r9,  ss64p->r10, ss64p->r11,
+                   ss64p->r12, ss64p->r13, ss64p->r14, ss64p->r15,
+                   ss64p->isf.rflags, ss64p->isf.rip, ss64p->isf.cs,
+                   ss64p->isf.ss);
+               PC = ss64p->isf.rip;
+       }
+
+       kdb_printf("Backtrace (CPU %d), "
+#if PRINT_ARGS_FROM_STACK_FRAME
+       "Frame : Return Address (4 potential args on stack)\n", cn);
+#else
+       "Frame : Return Address\n", cn);
+#endif
 
        for (frame_index = 0; frame_index < nframes; frame_index++) {
                vm_offset_t curframep = (vm_offset_t) frame;
@@ -974,19 +1221,21 @@ panic_i386_backtrace(void *_frame, int nframes)
                }
 
                if (!kvtophys(curframep) ||
-                   !kvtophys(curframep + sizeof(cframe_t))) {
+                   !kvtophys(curframep + sizeof(cframe_t) - 1)) {
                        kdb_printf("No mapping exists for frame pointer\n");
                        goto invalid;
                }
 
-               kdb_printf("%p : 0x%x ", frame, frame->caller);
+               kdb_printf("%p : 0x%lx ", frame, frame->caller);
                if (frame_index < DUMPFRAMES)
                        raddrs[frame_index] = frame->caller;
 
+#if PRINT_ARGS_FROM_STACK_FRAME
                if (kvtophys((vm_offset_t)&(frame->args[3])))
-                       kdb_printf("(0x%x 0x%x 0x%x 0x%x) \n",
+                       kdb_printf("(0x%x 0x%x 0x%x 0x%x) ",
                            frame->args[0], frame->args[1],
                            frame->args[2], frame->args[3]);
+#endif
 
                /* Display address-symbol translation only if the "keepsyms"
                 * boot-arg is suppplied, since we unload LINKEDIT otherwise.
@@ -996,11 +1245,8 @@ panic_i386_backtrace(void *_frame, int nframes)
                if (keepsyms)
                        panic_print_symbol_name((vm_address_t)frame->caller);
                
-               /* Stack grows downward */
-               if (frame->prev < frame) {
-                       frame = frame->prev;
-                       goto invalid;
-               }
+               kdb_printf("\n");
+
                frame = frame->prev;
        }
 
@@ -1018,9 +1264,15 @@ out:
         * the kmod list safely.
         */
        if (frame_index)
-               kmod_dump((vm_offset_t *)&raddrs[0], frame_index);
+               kmod_panic_dump((vm_offset_t *)&raddrs[0], frame_index);
+
+       if (PC != 0)
+               kmod_panic_dump(&PC, 1);
 
        panic_display_system_configuration();
+
+       doprnt_hide_pointers = old_doprnt_hide_pointers;
+
        /* Release print backtrace lock, to permit other callers in the
         * event of panics on multiple processors.
         */
@@ -1032,3 +1284,203 @@ out:
        bt_tsc_timeout = rdtsc64() + PBT_TIMEOUT_CYCLES;
        while(*ppbtcnt && (rdtsc64() < bt_tsc_timeout));
 }
+
+static boolean_t
+debug_copyin(pmap_t p, uint64_t uaddr, void *dest, size_t size)
+{
+        size_t rem = size;
+        char *kvaddr = dest;
+
+        while (rem) {
+                ppnum_t upn = pmap_find_phys(p, uaddr);
+                uint64_t phys_src = ptoa_64(upn) | (uaddr & PAGE_MASK);
+                uint64_t phys_dest = kvtophys((vm_offset_t)kvaddr);
+                uint64_t src_rem = PAGE_SIZE - (phys_src & PAGE_MASK);
+                uint64_t dst_rem = PAGE_SIZE - (phys_dest & PAGE_MASK);
+                size_t cur_size = (uint32_t) MIN(src_rem, dst_rem);
+                cur_size = MIN(cur_size, rem);
+
+                if (upn && pmap_valid_page(upn) && phys_dest) {
+                        bcopy_phys(phys_src, phys_dest, cur_size);
+                }
+                else
+                        break;
+                uaddr += cur_size;
+                kvaddr += cur_size;
+                rem -= cur_size;
+        }
+        return (rem == 0);
+}
+
+void
+print_threads_registers(thread_t thread)
+{
+       x86_saved_state_t *savestate;
+       
+       savestate = get_user_regs(thread);
+       kdb_printf(
+               "\nRAX: 0x%016llx, RBX: 0x%016llx, RCX: 0x%016llx, RDX: 0x%016llx\n"
+           "RSP: 0x%016llx, RBP: 0x%016llx, RSI: 0x%016llx, RDI: 0x%016llx\n"
+           "R8:  0x%016llx, R9:  0x%016llx, R10: 0x%016llx, R11: 0x%016llx\n"
+               "R12: 0x%016llx, R13: 0x%016llx, R14: 0x%016llx, R15: 0x%016llx\n"
+               "RFL: 0x%016llx, RIP: 0x%016llx, CS:  0x%016llx, SS:  0x%016llx\n\n",
+               savestate->ss_64.rax, savestate->ss_64.rbx, savestate->ss_64.rcx, savestate->ss_64.rdx,
+               savestate->ss_64.isf.rsp, savestate->ss_64.rbp, savestate->ss_64.rsi, savestate->ss_64.rdi,
+               savestate->ss_64.r8, savestate->ss_64.r9,  savestate->ss_64.r10, savestate->ss_64.r11,
+               savestate->ss_64.r12, savestate->ss_64.r13, savestate->ss_64.r14, savestate->ss_64.r15,
+               savestate->ss_64.isf.rflags, savestate->ss_64.isf.rip, savestate->ss_64.isf.cs,
+               savestate->ss_64.isf.ss);
+}
+
+void
+print_tasks_user_threads(task_t task)
+{
+       thread_t                thread = current_thread();
+       x86_saved_state_t *savestate;
+       pmap_t                  pmap = 0;
+       uint64_t                rbp;
+       const char              *cur_marker = 0;
+       int             j;
+       
+       for (j = 0, thread = (thread_t) queue_first(&task->threads); j < task->thread_count;
+                       ++j, thread = (thread_t) queue_next(&thread->task_threads)) {
+
+               kdb_printf("Thread %d: %p\n", j, thread);
+               pmap = get_task_pmap(task);
+               savestate = get_user_regs(thread);
+               rbp = savestate->ss_64.rbp;
+               kdb_printf("\t0x%016llx\n", savestate->ss_64.isf.rip);
+               print_one_backtrace(pmap, (vm_offset_t)rbp, cur_marker, TRUE, TRUE);
+               kdb_printf("\n");
+       }
+}
+
+void
+print_thread_num_that_crashed(task_t task)
+{
+       thread_t                c_thread = current_thread();
+       thread_t                thread;
+       int             j;
+       
+       for (j = 0, thread = (thread_t) queue_first(&task->threads); j < task->thread_count;
+                       ++j, thread = (thread_t) queue_next(&thread->task_threads)) {
+
+               if (c_thread == thread) {
+                       kdb_printf("\nThread %d crashed\n", j);
+                       break;
+               }
+       }
+}
+
+#define PANICLOG_UUID_BUF_SIZE 256
+
+void print_uuid_info(task_t task)
+{
+       uint32_t                uuid_info_count = 0;
+       mach_vm_address_t       uuid_info_addr = 0;
+       boolean_t               have_map = (task->map != NULL) &&       (ml_validate_nofault((vm_offset_t)(task->map), sizeof(struct _vm_map)));
+       boolean_t               have_pmap = have_map && (task->map->pmap != NULL) && (ml_validate_nofault((vm_offset_t)(task->map->pmap), sizeof(struct pmap)));
+       int                             task_pid = pid_from_task(task);
+       char                    uuidbuf[PANICLOG_UUID_BUF_SIZE] = {0};
+       char                    *uuidbufptr = uuidbuf;
+       uint32_t                k;
+
+       if (have_pmap && task->active && task_pid > 0) {
+               /* Read dyld_all_image_infos struct from task memory to get UUID array count & location */
+               struct user64_dyld_all_image_infos task_image_infos;
+               if (debug_copyin(task->map->pmap, task->all_image_info_addr,
+                       &task_image_infos, sizeof(struct user64_dyld_all_image_infos))) {
+                       uuid_info_count = (uint32_t)task_image_infos.uuidArrayCount;
+                       uuid_info_addr = task_image_infos.uuidArray;
+               }
+
+               /* If we get a NULL uuid_info_addr (which can happen when we catch dyld
+                * in the middle of updating this data structure), we zero the
+                * uuid_info_count so that we won't even try to save load info for this task
+                */
+               if (!uuid_info_addr) {
+                       uuid_info_count = 0;
+               }
+       }
+
+       if (task_pid > 0 && uuid_info_count > 0) {
+               uint32_t uuid_info_size = sizeof(struct user64_dyld_uuid_info);
+               uint32_t uuid_array_size = uuid_info_count * uuid_info_size;
+               uint32_t uuid_copy_size = 0;
+               uint32_t uuid_image_count = 0;
+               char *current_uuid_buffer = NULL;
+               /* Copy in the UUID info array. It may be nonresident, in which case just fix up nloadinfos to 0 */
+               
+               kdb_printf("\nuuid info:\n");
+               while (uuid_array_size) {
+                       if (uuid_array_size <= PANICLOG_UUID_BUF_SIZE) {
+                               uuid_copy_size = uuid_array_size;
+                               uuid_image_count = uuid_array_size/uuid_info_size;
+                       } else {
+                               uuid_image_count = PANICLOG_UUID_BUF_SIZE/uuid_info_size;
+                               uuid_copy_size = uuid_image_count * uuid_info_size;
+                       }
+                       if (have_pmap && !debug_copyin(task->map->pmap, uuid_info_addr, uuidbufptr,
+                               uuid_copy_size)) {
+                               kdb_printf("Error!! Failed to copy UUID info for task %p pid %d\n", task, task_pid);
+                               uuid_image_count = 0;
+                               break;
+                       }
+
+                       if (uuid_image_count > 0) {
+                               current_uuid_buffer = uuidbufptr;
+                               for (k = 0; k < uuid_image_count; k++) {
+                                       kdb_printf(" %#llx", *(uint64_t *)current_uuid_buffer);
+                                       current_uuid_buffer += sizeof(uint64_t);
+                                       uint8_t *uuid = (uint8_t *)current_uuid_buffer;
+                                       kdb_printf("\tuuid = <%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x>\n",
+                                       uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], uuid[8],
+                                       uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15]);
+                                       current_uuid_buffer += 16;
+                               }
+                               bzero(&uuidbuf, sizeof(uuidbuf));
+                       }
+                       uuid_info_addr += uuid_copy_size;
+                       uuid_array_size -= uuid_copy_size;
+               }
+       }
+}
+
+void print_launchd_info(void)
+{
+       task_t          task = current_task();
+       thread_t        thread = current_thread();
+       volatile        uint32_t *ppbtcnt = &pbtcnt;
+       uint64_t        bt_tsc_timeout;
+       int             cn = cpu_number();
+
+       if(pbtcpu != cn) {
+               hw_atomic_add(&pbtcnt, 1);
+               /* Spin on print backtrace lock, which serializes output
+                * Continue anyway if a timeout occurs.
+                */
+               hw_lock_to(&pbtlock, ~0U);
+               pbtcpu = cn;
+       }
+       
+       print_uuid_info(task);
+       print_thread_num_that_crashed(task);
+       print_threads_registers(thread);
+       print_tasks_user_threads(task);
+       kdb_printf("Mac OS version: %s\n", (osversion[0] != 0) ? osversion : "Not yet set");
+       kdb_printf("Kernel version: %s\n", version);
+       panic_display_kernel_uuid();
+       panic_display_model_name();
+       
+       /* Release print backtrace lock, to permit other callers in the
+        * event of panics on multiple processors.
+        */
+       hw_lock_unlock(&pbtlock);
+       hw_atomic_sub(&pbtcnt, 1);
+       /* Wait for other processors to complete output
+        * Timeout and continue after PBT_TIMEOUT_CYCLES.
+        */
+       bt_tsc_timeout = rdtsc64() + PBT_TIMEOUT_CYCLES;
+       while(*ppbtcnt && (rdtsc64() < bt_tsc_timeout));
+
+}