Changeset 7779

Timestamp:

Nov 29, 2007, 1:27:23 PM (13 years ago)

Author:

gb

Message:

lisp_Debugger() takes an extra Boolean "in foreign context" arg, rather
than trying to set a bit in the exception code (which might be negative.)

Add a (T)hread info command to kernel debugger.

Location:

trunk/ccl/lisp-kernel

Files:

• lisp-debug.c (modified) (7 diffs)
• lisp-exceptions.h (modified) (1 diff)
• ppc-exceptions.c (modified) (2 diffs)
• x86-exceptions.c (modified) (3 diffs)

trunk/ccl/lisp-kernel/lisp-debug.c

@@ -503 +503 @@
 }
 
+debug_command_return
+debug_thread_info(ExceptionInformation *xp, siginfo_t *info, int arg)
+{
+  TCR * tcr = get_tcr(false);
+  
+  if (tcr) {
+    area *vs_area = tcr->vs_area, *cs_area = tcr->cs_area;
+
+    fprintf(stderr, "Current Thread Context Record (tcr) = 0x%lx\n", tcr);
+    fprintf(stderr, "Control (C) stack area:  low = 0x%lx, high = 0x%lx\n",
+            cs_area->low, cs_area->high);
+    fprintf(stderr, "Value (lisp) stack area: low = 0x%lx, high = 0x%lx\n",
+            vs_area->low, vs_area->high);
+    if (xp) {
+      fprintf(stderr, "Exception stack pointer = 0x%lx\n",
+#ifdef PPC
+              xpGPR(xp,1)
+#endif
+#ifdef X86
+              xpGPR(xp,Isp)
+#endif
+              );
+    }
+  }
+  return debug_continue;
+}
       
 
@@ -719 +745 @@
    NULL,
    'B'},
+  {debug_thread_info,
+   "Show info about current thread",
+   0,
+   NULL,
+   'T'},
   {debug_win,
    "Exit from this debugger, asserting that any exception was handled",
@@ -817 +848 @@
               siginfo_t *info, 
               int why, 
+              Boolean in_foreign_code,
               char *message, 
               ...)
@@ -822 +854 @@
   va_list args;
   debug_command_return state = debug_continue;
-  int in_foreign_code = (why & debug_foreign_exception);
 
   if (threads_initialized) {
@@ -834 +865 @@
   if (in_foreign_code) {
     fprintf(stderr, "Exception occurred while executing foreign code\n");
-    why = (why & ~debug_foreign_exception);
   }
 
@@ -876 +906 @@
   vsnprintf(s, sizeof(s),format, args);
   va_end(args);
-  lisp_Debugger(xp, NULL, debug_entry_bug, s);
+  lisp_Debugger(xp, NULL, debug_entry_bug, false, s);
 
 }
@@ -889 +919 @@
   vsnprintf(s, sizeof(s),format, args);
   va_end(args);
-  lisp_Debugger(xp, NULL, debug_entry_bug | debug_foreign_exception , s);
+  lisp_Debugger(xp, NULL, debug_entry_bug, true, s);
 
 }

trunk/ccl/lisp-kernel/lisp-exceptions.h

@@ -42 +42 @@
 
 OSStatus
-lisp_Debugger(ExceptionInformation *, siginfo_t *, int, char *, ...);
+lisp_Debugger(ExceptionInformation *, siginfo_t *, int, Boolean, char *, ...);
 
 OSStatus

trunk/ccl/lisp-kernel/ppc-exceptions.c

@@ -1549 +1549 @@
         message = "Lisp Breakpoint";
       }
-      lisp_Debugger(xp, info, debug_entry_dbg, message);
+      lisp_Debugger(xp, info, debug_entry_dbg, false, message);
       return noErr;
     }
     if (the_trap == QUIET_LISP_BREAK_INSTRUCTION) {
       adjust_exception_pc(xp,4);
-      lisp_Debugger(xp, info, debug_entry_dbg, "Lisp Breakpoint");
+      lisp_Debugger(xp, info, debug_entry_dbg, false, "Lisp Breakpoint");
       return noErr;
     }
@@ -1762 +1762 @@
   wait_for_exception_lock_in_handler(tcr, context, &xframe_link);
   if ((noErr != PMCL_exception_handler(signum, context, tcr, info, old_valence))) {
+    Boolean foreign = (old_valence != TCR_STATE_LISP);
     char msg[512];
     snprintf(msg, sizeof(msg), "Unhandled exception %d at 0x%lx, context->regs at #x%lx", signum, xpPC(context), (natural)xpGPRvector(context));
-    if (lisp_Debugger(context, info, signum, msg)) {
+    if (lisp_Debugger(context, info, signum, foreign, msg)) {
       SET_TCR_FLAG(tcr,TCR_FLAG_BIT_PROPAGATE_EXCEPTION);
     }

trunk/ccl/lisp-kernel/x86-exceptions.c

@@ -786 +786 @@
         case UUO_DEBUG_TRAP:
           xpPC(context) = (natural) (program_counter+1);
-          lisp_Debugger(context, info, debug_entry_dbg, "Lisp Breakpoint");
+          lisp_Debugger(context, info, debug_entry_dbg, false, "Lisp Breakpoint");
           return true;
 
@@ -795 +795 @@
 
             get_lisp_string(xpGPR(context,Iarg_z),msg, sizeof(msg)-1);
-            lisp_Debugger(context, info, debug_entry_dbg, msg);
+            lisp_Debugger(context, info, debug_entry_dbg, false,  msg);
           }
           return true;
@@ -963 +963 @@
   if (! handle_exception(signum, info, context, tcr, old_valence)) {
     char msg[512];
-    int foreign = (old_valence == TCR_STATE_LISP) ? 0 : debug_foreign_exception;
+    Boolean foreign = (old_valence != TCR_STATE_LISP);
 
     snprintf(msg, sizeof(msg), "Unhandled exception %d at 0x%lx, context->regs at #x%lx", signum, xpPC(context), (natural)xpGPRvector(context));
     
-    if (lisp_Debugger(context, info, signum | foreign, msg)) {
+    if (lisp_Debugger(context, info, signum, foreign, msg)) {
       SET_TCR_FLAG(tcr,TCR_FLAG_BIT_PROPAGATE_EXCEPTION);
     }