X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fmips-linux-os.c;h=165fc2984264059fc73a9d6779ea5b361fa50b5f;hb=c75cf4e142aaf9a72433ea6db778d8111a0b1c83;hp=04e106feac3184b1164cbce7acf1b84ed4dee67f;hpb=05ad80b2794b48ecc96b43c43577ae4a7ba2af6b;p=sbcl.git

diff --git a/src/runtime/mips-linux-os.c b/src/runtime/mips-linux-os.c
index 04e106f..165fc29 100644
--- a/src/runtime/mips-linux-os.c
+++ b/src/runtime/mips-linux-os.c
@@ -15,32 +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>
 
-/* for BD_CAUSE */
-#include <asm/mipsregs.h>
+#include "sbcl.h"
+#include "os.h"
+#include "arch.h"
 
-#include "validate.h"
+#define CAUSEF_BD (1 << 31)
 
 size_t os_vm_page_size;
 
@@ -65,20 +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)
 {
-    return &(((struct sigcontext *)&(context->uc_mcontext))->sc_fpregs[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 *
@@ -119,26 +109,15 @@ os_context_bd_cause(os_context_t *context)
        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.  */
-    unsigned int inst = *((unsigned int *)(unsigned int)(*os_context_pc_addr(context)));
-
-    switch (inst >> 26) {
-    case 0x0: /* immediate jumps */
-        switch (inst & 0x3f) {
-        case 0x08:
-        case 0x09:
-            return CAUSEF_BD;
-        }
-        break;
-    /* branches and register jumps */
-    case 0x1:
-    case 0x2:
-    case 0x3:
-    case 0x4:
-    case 0x5:
-    case 0x6:
-    case 0x7:
+    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;
 }