X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fhppa-arch.c;h=bf9a4645461ecab6f21186a996255cb238047866;hb=4b585c19dcd87dc3410094a2d2d7385d49200a44;hp=8fba41671f440a9fbed8ff09fa56b681d29bcccc;hpb=bf282f716a1ecaa09794a2cac7ce7da8d0d87675;p=sbcl.git

diff --git a/src/runtime/hppa-arch.c b/src/runtime/hppa-arch.c
index 8fba416..bf9a464 100644
--- a/src/runtime/hppa-arch.c
+++ b/src/runtime/hppa-arch.c
@@ -76,7 +76,18 @@ unsigned char *arch_internal_error_arguments(os_context_t *context)
 
 boolean arch_pseudo_atomic_atomic(os_context_t *context)
 {
-    return ((*os_context_register_addr(context,reg_ALLOC)) & 4);
+    /* FIXME: this foreign_function_call_active test is dubious at
+     * best. If a foreign call is made in a pseudo atomic section
+     * (?) or more likely a pseudo atomic section is in a foreign
+     * call then an interrupt is executed immediately. Maybe it
+     * has to do with C code not maintaining pseudo atomic
+     * properly. MG - 2005-08-10
+     *
+     * The foreign_function_call_active used to live at each call-site
+     * to arch_pseudo_atomic_atomic, but this seems clearer.
+     * --NS 2007-05-15 */
+    return (!foreign_function_call_active)
+        && ((*os_context_register_addr(context,reg_ALLOC)) & 4);
 }
 
 void arch_set_pseudo_atomic_interrupted(os_context_t *context)
@@ -181,7 +192,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;
@@ -196,49 +226,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);
     }
 }
 
@@ -419,44 +407,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);
-}