X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-arch.c;h=b33b1185e24c2095eef0dc1c5577972a0c7022cb;hb=dc5d8cef786c974258601109f79ab18f874b1270;hp=d53ea91eb1a65b494f45ce3e4a307cb12bb9d801;hpb=9b92e0500ac3aeb3012f94c5450bf321747f2fb3;p=sbcl.git

diff --git a/src/runtime/mips-arch.c b/src/runtime/mips-arch.c
index d53ea91..b33b118 100644
--- a/src/runtime/mips-arch.c
+++ b/src/runtime/mips-arch.c
@@ -386,19 +386,33 @@ arch_handle_after_breakpoint(os_context_t *context)
     *os_context_sigmask_addr(context) = orig_sigmask;
 }
 
+void
+arch_handle_single_step_trap(os_context_t *context, int trap)
+{
+    unsigned int code = *((u32 *)(os_context_pc(context)));
+    int register_offset = code >> 11 & 0x1f;
+    handle_single_step_trap(context, trap, register_offset);
+    arch_skip_instruction(context);
+}
+
 static void
 sigtrap_handler(int signal, siginfo_t *info, void *void_context)
 {
     os_context_t *context = arch_os_get_context(&void_context);
     unsigned int code = (os_context_insn(context) >> 6) & 0xfffff;
-    /* FIXME: WTF is this magic number? Needs to become a #define
-     * and go into maybe_handle_trap. */
+#ifdef LISP_FEATURE_LINUX
+    os_restore_fp_control(context);
+#endif
+    /* FIXME: This magic number is pseudo-atomic-trap from parms.lisp.
+     * Genesis should provide the proper #define, but it specialcases
+     * pseudo-atomic-trap to work around some oddity on SPARC.
+     * Eventually this should go into handle_trap. */
     if (code==0x10) {
         arch_clear_pseudo_atomic_interrupted(context);
         arch_skip_instruction(context);
         interrupt_handle_pending(context);
-    } else if (!maybe_handle_trap(context,code))
-        interrupt_handle_now(signal, info, void_context);
+    } else
+        handle_trap(context,code & 0x1f);
 }
 
 #define FIXNUM_VALUE(lispobj) (((int)lispobj) >> N_FIXNUM_TAG_BITS)
@@ -411,6 +425,9 @@ sigfpe_handler(int signal, siginfo_t *info, void *void_context)
     unsigned int op, rs, rt, rd, funct, dest = 32;
     int immed;
     int result;
+#ifdef LISP_FEATURE_LINUX
+    os_restore_fp_control(context);
+#endif
 
     op = (bad_inst >> 26) & 0x3f;
     rs = (bad_inst >> 21) & 0x1f;
@@ -462,57 +479,27 @@ sigfpe_handler(int signal, siginfo_t *info, void *void_context)
     arch_skip_instruction(context);
 }
 
-void
-arch_install_interrupt_handlers(void)
-{
-    undoably_install_low_level_interrupt_handler(SIGTRAP,sigtrap_handler);
-    undoably_install_low_level_interrupt_handler(SIGFPE,sigfpe_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)
+unsigned int
+arch_get_fp_control(void)
 {
-    lispobj *args = current_control_stack_pointer;
+    register unsigned int ret asm("$2");
 
-    current_control_stack_pointer += 1;
-    args[0] = arg0;
+    __asm__ __volatile__ ("cfc1 %0, $31" : "=r" (ret));
 
-    return call_into_lisp(function, args, 1);
+    return ret;
 }
 
-lispobj
-funcall2(lispobj function, lispobj arg0, lispobj arg1)
+void
+arch_set_fp_control(unsigned int fp)
 {
-    lispobj *args = current_control_stack_pointer;
-
-    current_control_stack_pointer += 2;
-    args[0] = arg0;
-    args[1] = arg1;
-
-    return call_into_lisp(function, args, 2);
+    __asm__ __volatile__ ("ctc1 %0, $31" :: "r" (fp));
 }
 
-lispobj
-funcall3(lispobj function, lispobj arg0, lispobj arg1, lispobj arg2)
+void
+arch_install_interrupt_handlers(void)
 {
-    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);
+    undoably_install_low_level_interrupt_handler(SIGTRAP,sigtrap_handler);
+    undoably_install_low_level_interrupt_handler(SIGFPE,sigfpe_handler);
 }
 
 #ifdef LISP_FEATURE_LINKAGE_TABLE