Changeset 7657 for branches

Timestamp:

Nov 15, 2007, 4:25:36 PM (17 years ago)

Author:

Gary Byers

Message:

lisp_Debugger takes an "in_foreign_code" arg, rather than trying to set
a bit in a (possibly signed) integer.

Location:

branches/working-0711/ccl/lisp-kernel

Files:

• ppc-exceptions.c (modified) (2 diffs)
• x86-exceptions.c (modified) (3 diffs)

branches/working-0711/ccl/lisp-kernel/ppc-exceptions.c

@@ -1553 +1553 @@
         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;
     }
@@ -1774 +1774 @@
     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, false, msg)) {
       SET_TCR_FLAG(tcr,TCR_FLAG_BIT_PROPAGATE_EXCEPTION);
     }

branches/working-0711/ccl/lisp-kernel/x86-exceptions.c

@@ -790 +790 @@
         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;
 
@@ -799 +799 @@
 
             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;
@@ -975 +975 @@
   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);
     }