1.0.4.40: small fixes

[sbcl.git] / src / runtime / alpha-arch.c

diff --git a/src/runtime/alpha-arch.c b/src/runtime/alpha-arch.c
index 96f7f2c..5c71fa7 100644 (file)
--- a/src/runtime/alpha-arch.c
+++ b/src/runtime/alpha-arch.c
@@ -277,6 +277,21 @@ void arch_do_displaced_inst(os_context_t *context,unsigned int orig_inst)
     os_flush_icache((os_vm_address_t)next_pc, sizeof(unsigned int));
 }
 
+void
+arch_handle_breakpoint(os_context_t *context)
+{
+        *os_context_pc_addr(context) -=4;
+        handle_breakpoint(context);
+}
+
+void
+arch_handle_fun_end_breakpoint(os_context_t *context)
+{
+    *os_context_pc_addr(context) -=4;
+    *os_context_pc_addr(context) =
+        (int)handle_fun_end_breakpoint(context);
+}
+
 static void
 sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context)
 {
@@ -313,38 +328,7 @@ sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context)
     } else
         /* a "system service" */
     code=*((u32 *)(*os_context_pc_addr(context)));
-
-    switch (code) {
-      case trap_PendingInterrupt:
-        arch_skip_instruction(context);
-        interrupt_handle_pending(context);
-        break;
-
-      case trap_Halt:
-        fake_foreign_function_call(context);
-        lose("%%primitive halt called; the party is over.\n");
-
-      case trap_Error:
-      case trap_Cerror:
-        interrupt_internal_error(signal, siginfo, context, code==trap_Cerror);
-        break;
-
-    case trap_Breakpoint:        /* call lisp-level handler */
-        *os_context_pc_addr(context) -=4;
-        handle_breakpoint(signal, siginfo, context);
-        break;
-
-      case trap_FunEndBreakpoint:
-        *os_context_pc_addr(context) -=4;
-        *os_context_pc_addr(context) =
-            (int)handle_fun_end_breakpoint(signal, siginfo, context);
-        break;
-
-      default:
-        fprintf(stderr, "unidentified breakpoint/trap %d\n",code);
-        interrupt_handle_now(signal, siginfo, context);
-        break;
-    }
+    handle_trap(context, code);
 }
 
 unsigned long
@@ -364,46 +348,3 @@ void arch_install_interrupt_handlers()
 {
     undoably_install_low_level_interrupt_handler(SIGTRAP, sigtrap_handler);
 }
-
-extern lispobj call_into_lisp(lispobj fun, lispobj *args, int nargs);
-
-lispobj funcall0(lispobj function)
-{
-    lispobj *args = current_control_stack_pointer;
-
-    return call_into_lisp(function, args, 0);
-}
-
-lispobj funcall1(lispobj function, lispobj arg0)
-{
-    lispobj *args = current_control_stack_pointer;
-
-    current_control_stack_pointer += 1;
-    args[0] = arg0;
-
-    return call_into_lisp(function, args, 1);
-}
-
-lispobj funcall2(lispobj function, lispobj arg0, lispobj arg1)
-{
-    lispobj *args = current_control_stack_pointer;
-
-    current_control_stack_pointer += 2;
-    args[0] = arg0;
-    args[1] = arg1;
-
-    return call_into_lisp(function, args, 2);
-}
-
-lispobj funcall3(lispobj function, lispobj arg0, lispobj arg1, lispobj arg2)
-{
-    lispobj *args = current_control_stack_pointer;
-
-    current_control_stack_pointer += 3;
-    args[0] = arg0;
-    args[1] = arg1;
-    args[2] = arg2;
-
-    return call_into_lisp(function, args, 3);
-}
-