xnu-792.6.56.tar.gz

[apple/xnu.git] / osfmk / kern / debug.c

diff --git a/osfmk/kern/debug.c b/osfmk/kern/debug.c
index 5fedc28cc041e4ef8f3f57dfc1117c48be0f7014..49bbc8ca0a61e8e8c53db36127db56767a03ba62 100644 (file)
--- a/osfmk/kern/debug.c
+++ b/osfmk/kern/debug.c
@@ -3,19 +3,20 @@
  *
  * @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.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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@
  */
@@ -52,7 +53,6 @@
 #include <mach_kdb.h>
 #include <mach_kgdb.h>
 #include <mach_kdp.h>
-#include <cpus.h>
 
 #include <kern/cpu_number.h>
 #include <kern/lock.h>
@@ -62,6 +62,7 @@
 #include <kern/sched_prim.h>
 #include <kern/misc_protos.h>
 #include <vm/vm_kern.h>
+#include <vm/pmap.h>
 #include <stdarg.h>
 
 #ifdef __ppc__
@@ -77,11 +78,7 @@ unsigned int debug_mode=0;
 unsigned int   disableDebugOuput = TRUE;
 unsigned int   systemLogDiags = FALSE;
 unsigned int    logPanicDataToScreen = FALSE;
-#ifdef __ppc__
-        unsigned int   panicDebugging = FALSE;
-#else
-        unsigned int   panicDebugging = TRUE;
-#endif
+unsigned int   panicDebugging = FALSE;
 
 int mach_assert = 1;
 
@@ -89,12 +86,13 @@ const char          *panicstr = (char *) 0;
 decl_simple_lock_data(,panic_lock)
 int                    paniccpu;
 volatile int           panicwait;
-volatile int           nestedpanic= 0;
+volatile unsigned int  nestedpanic= 0;
 unsigned int           panic_is_inited = 0;
 unsigned int           return_on_panic = 0;
-wait_queue_t           save_waits[NCPUS];
+unsigned long          panic_caller;
 
 char *debug_buf;
+ppnum_t debug_buf_page;
 char *debug_buf_ptr;
 unsigned int debug_buf_size = 0;
 
@@ -133,8 +131,9 @@ MACRO_END
 void
 panic_init(void)
 {
-       simple_lock_init(&panic_lock, ETAP_NO_TRACE);
+       simple_lock_init(&panic_lock, 0);
        panic_is_inited = 1;
+       panic_caller = 0;
 }
 
 void
@@ -143,6 +142,7 @@ panic(const char *str, ...)
        va_list listp;
        spl_t   s;
        thread_t thread;
+       wait_queue_t wq;
 
        s = splhigh();
        disable_preemption();
@@ -152,13 +152,18 @@ panic(const char *str, ...)
 #endif
 
        thread = current_thread();              /* Get failing thread */
-       save_waits[cpu_number()] = thread->wait_queue;  /* Save the old value */
+       wq = thread->wait_queue;                /* Save the old value */
        thread->wait_queue = 0;                 /* Clear the wait so we do not get double panics when we try locks */
 
        if( logPanicDataToScreen )
                disableDebugOuput = FALSE;
                
        debug_mode = TRUE;
+
+       /* panic_caller is initialized to 0.  If set, don't change it */
+       if ( ! panic_caller )
+               panic_caller = (unsigned long) __builtin_return_address(0);
+       
 restart:
        PANIC_LOCK();
        if (panicstr) {
@@ -185,7 +190,7 @@ restart:
        panicwait = 1;
 
        PANIC_UNLOCK();
-       kdb_printf("panic(cpu %d): ", (unsigned) paniccpu);
+       kdb_printf("panic(cpu %d caller 0x%08X): ", (unsigned) paniccpu, panic_caller);
        va_start(listp, str);
        _doprnt(str, &listp, consdebug_putc, 0);
        va_end(listp);
@@ -202,7 +207,7 @@ restart:
        PANIC_LOCK();
        panicstr = (char *)0;
        PANIC_UNLOCK();
-       thread->wait_queue = save_waits[cpu_number()];  /* Restore the wait queue */
+       thread->wait_queue = wq;        /* Restore the wait queue */
        if (return_on_panic) {
                enable_preemption();
                splx(s);
@@ -239,6 +244,7 @@ debug_log_init(void)
                panic("cannot allocate debug_buf \n");
        debug_buf_ptr = debug_buf;
        debug_buf_size = PAGE_SIZE;
+        debug_buf_page = pmap_find_phys(kernel_pmap, (addr64_t)(uintptr_t)debug_buf_ptr);
 }
 
 void