X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fhppa-arch.c;h=46fdb3468befd84334e1984c371bcf7c8c4844f5;hb=42f9c07927666c353a5eaf395718da5b6d12ce04;hp=5f81f5e460882b889f8e1a06f75683ca306d96e7;hpb=b27fb452f72190637b03a6ef2e1333091da42a98;p=sbcl.git

diff --git a/src/runtime/hppa-arch.c b/src/runtime/hppa-arch.c
index 5f81f5e..46fdb34 100644
--- a/src/runtime/hppa-arch.c
+++ b/src/runtime/hppa-arch.c
@@ -23,7 +23,6 @@
 #include "interrupt.h"
 #include "interr.h"
 #include "breakpoint.h"
-#include "monitor.h"
 
 void arch_init(void)
 {
@@ -85,6 +84,12 @@ void arch_set_pseudo_atomic_interrupted(os_context_t *context)
     *os_context_register_addr(context,reg_ALLOC) |=  1;
 }
 
+/* FIXME: untested */
+void arch_clear_pseudo_atomic_interrupted(os_context_t *context)
+{
+    *os_context_register_addr(context,reg_ALLOC) &= ~1;
+}
+
 void arch_skip_instruction(os_context_t *context)
 {
     ((char *) *os_context_pc_addr(context)) = ((char *) *os_context_npc_addr(context));
@@ -176,7 +181,26 @@ static void restore_breakpoint(struct sigcontext *scp)
 }
 #endif
 
-static void sigtrap_handler(int signal, siginfo_t *siginfo, void *void_context)
+void
+arch_handle_breakpoint(os_context_t *context)
+{
+    /*sigsetmask(scp->sc_mask); */
+    handle_breakpoint(context);
+}
+
+void
+arch_handle_fun_end_breakpoint(os_context_t *context)
+{
+    /*sigsetmask(scp->sc_mask); */
+    unsigned long pc;
+    pc = (unsigned long)
+        handle_fun_end_breakpoint(context);
+    *os_context_pc_addr(context) = pc;
+    *os_context_npc_addr(context) = pc + 4;
+}
+
+static void
+sigtrap_handler(int signal, siginfo_t *siginfo, void *void_context)
 {
     os_context_t *context = arch_os_get_context(&void_context);
     unsigned int bad_inst;
@@ -191,49 +215,7 @@ static void sigtrap_handler(int signal, siginfo_t *siginfo, void *void_context)
         interrupt_handle_now(signal, siginfo, context);
     else {
         int im5 = bad_inst & 0x1f;
-
-        switch (im5) {
-        case trap_Halt:
-            fake_foreign_function_call(context);
-            lose("%%primitive halt called; the party is over.\n");
-
-        case trap_PendingInterrupt:
-            arch_skip_instruction(context);
-            interrupt_handle_pending(context);
-            break;
-
-        case trap_Error:
-        case trap_Cerror:
-            interrupt_internal_error(signal, siginfo, context, im5==trap_Cerror);
-            break;
-
-        case trap_Breakpoint:
-            /*sigsetmask(scp->sc_mask); */
-            handle_breakpoint(signal, siginfo, context);
-            break;
-
-        case trap_FunEndBreakpoint:
-            /*sigsetmask(scp->sc_mask); */
-            {
-                unsigned long pc;
-                pc = (unsigned long)
-                    handle_fun_end_breakpoint(signal, siginfo, context);
-                *os_context_pc_addr(context) = pc;
-                *os_context_npc_addr(context) = pc + 4;
-            }
-            break;
-
-        case trap_SingleStepBreakpoint:
-            /* Uh, FIXME */
-#ifdef hpux
-            restore_breakpoint(context);
-#endif
-            break;
-
-        default:
-            interrupt_handle_now(signal, siginfo, context);
-            break;
-        }
+        handle_trap(context, trap);
     }
 }
 
@@ -414,44 +396,3 @@ void arch_install_interrupt_handlers(void)
     /* FIXME: beyond 2.4.19-pa4 this shouldn't be necessary. */
     undoably_install_low_level_interrupt_handler(SIGBUS,sigbus_handler);
 }
-
-
-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);
-}