Changeset 13848

Timestamp:

Jun 16, 2010, 2:45:58 AM (14 years ago)

Author:

Gary Byers

Message:

Pass siginfo to handle_uuo; change debug_trap handling.

Location:

branches/arm/lisp-kernel

Files:

• arm-exceptions.c (modified) (3 diffs)
• arm-exceptions.h (modified) (1 diff)

branches/arm/lisp-kernel/arm-exceptions.c

@@ -1007 +1007 @@
       return handle_gc_trap(xp, tcr);
     } else if (IS_UUO(instruction)) {
-      return handle_uuo(xp, instruction);
+      return handle_uuo(xp, info, instruction);
     } else {
       return handle_unimplemented_instruction(xp,instruction,tcr);
@@ -1041 +1041 @@
 
 Boolean
-handle_uuo(ExceptionInformation *xp, opcode the_uuo) 
+handle_uuo(ExceptionInformation *xp, siginfo_t *info, opcode the_uuo) 
 {
   unsigned 
@@ -1113 +1113 @@
     switch (UUOA_field(the_uuo)) {
     case 3:
-      Bug(xp, "Debug trap");
+      adjust_exception_pc(xp, bump);
+      bump = 0;
+      lisp_Debugger(xp, info, debug_entry_dbg, false, "Lisp Breakpoint");
       handled = true;
       break;

branches/arm/lisp-kernel/arm-exceptions.h

@@ -43 +43 @@
 typedef u_int32_t opcode, *pc;
 
-OSStatus
-handle_uuo(ExceptionInformation *, opcode);
+Boolean
+handle_uuo(ExceptionInformation *, siginfo_t *, opcode);