X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-linux-os.c;h=70f988e8f467df0b0c4e3681e93440fd5d0f2a8c;hb=dd04bd449535e9016b5652a708a3cac2ca24c87d;hp=9fee95eb338fe042c16ca8f4ec79ee61cf17a1f8;hpb=79cc569a97e444389350ea3f5b1017374fe16bec;p=sbcl.git

diff --git a/src/runtime/mips-linux-os.c b/src/runtime/mips-linux-os.c
index 9fee95e..70f988e 100644
--- a/src/runtime/mips-linux-os.c
+++ b/src/runtime/mips-linux-os.c
@@ -15,29 +15,16 @@
  */
 
 #include <stdio.h>
-#include <sys/param.h>
-#include <sys/file.h>
-#include "sbcl.h"
-#include "./signal.h"
-#include "os.h"
-#include "arch.h"
-#include "globals.h"
-#include "interrupt.h"
-#include "interr.h"
-#include "lispregs.h"
-#include <sys/socket.h>
-#include <sys/utsname.h>
-
-#include <sys/types.h>
 #include <signal.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
 /* for cacheflush() */
 #include <sys/cachectl.h>
 
-#include "validate.h"
+#include "sbcl.h"
+#include "os.h"
+#include "arch.h"
+
+#define CAUSEF_BD (1 << 31)
 
 size_t os_vm_page_size;
 
@@ -62,14 +49,26 @@ arch_os_thread_cleanup(struct thread *thread)
 os_context_register_t *
 os_context_register_addr(os_context_t *context, int offset)
 {
-    return &(((struct sigcontext *)&(context->uc_mcontext))->sc_regs[offset]);
+    mcontext_t *mctx = &context->uc_mcontext;
+    struct sigcontext *ctx = (struct sigcontext *)mctx;
+    return &ctx->sc_regs[offset];
+}
+
+os_context_register_t *
+os_context_fpregister_addr(os_context_t *context, int offset)
+{
+    mcontext_t *mctx = &context->uc_mcontext;
+    struct sigcontext *ctx = (struct sigcontext *)mctx;
+    return &ctx->sc_fpregs[offset];
 }
 
 os_context_register_t *
 os_context_pc_addr(os_context_t *context)
 {
     /* Why do I get all the silly ports? -- CSR, 2002-08-11 */
-    return &(((struct sigcontext *)&(context->uc_mcontext))->sc_pc);
+    mcontext_t *mctx = &context->uc_mcontext;
+    struct sigcontext *ctx = (struct sigcontext *)mctx;
+    return &ctx->sc_pc;
 }
 
 sigset_t *
@@ -81,13 +80,17 @@ os_context_sigmask_addr(os_context_t *context)
 unsigned int
 os_context_fp_control(os_context_t *context)
 {
-    /* FIXME: Probably do something. */
+    mcontext_t *mctx = &context->uc_mcontext;
+    struct sigcontext *ctx = (struct sigcontext *)mctx;
+    return ctx->sc_fpc_csr;
 }
 
 void
 os_restore_fp_control(os_context_t *context)
 {
-    /* FIXME: Probably do something. */
+    unsigned int ctl = os_context_fp_control(context);
+    ctl &= ~(FLOAT_STICKY_BITS_MASK | FLOAT_EXCEPTIONS_BYTE_MASK);
+    arch_set_fp_control(ctl);
 }
 
 unsigned int
@@ -101,12 +104,23 @@ os_context_bd_cause(os_context_t *context)
        loop" where a (BREAK 16) not in a branch delay slot would have
        CAUSEF_BD filled. So, we comment
 
-        #include <asm/mipsregs.h>
-
         return (((struct sigcontext *) &(context->uc_mcontext))->sc_cause
                 & CAUSEF_BD);
 
        out and return 0 always.  -- CSR, 2002-09-02 */
+    /* Unfortunately, returning 0 fails for taken branches because
+       os_context_bd_cause is also used to find out if a branch
+       emulation is needed.  We work around that by checking if the
+       current instruction is a jump or a branch.  */
+    extern boolean arch_insn_with_bdelay_p(unsigned int insn);
+
+    os_vm_address_t addr
+        = (os_vm_address_t)(unsigned int)*os_context_pc_addr(context);
+    unsigned int insn = *(unsigned int *)addr;
+
+    if (arch_insn_with_bdelay_p(insn))
+        return CAUSEF_BD;
+
     return 0;
 }