0.9.4.53:

[sbcl.git] / src / runtime / mips-linux-os.c

diff --git a/src/runtime/mips-linux-os.c b/src/runtime/mips-linux-os.c
index 1b9bed7..04e106f 100644 (file)
--- a/src/runtime/mips-linux-os.c
+++ b/src/runtime/mips-linux-os.c
@@ -34,46 +34,51 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "validate.h"
 /* for cacheflush() */
-#include <asm/cachectl.h>
+#include <sys/cachectl.h>
 
-/* FIXME: For CAUSEF_BD */
+/* for BD_CAUSE */
 #include <asm/mipsregs.h>
+
+#include "validate.h"
+
 size_t os_vm_page_size;
 
+int
+arch_os_thread_init(struct thread *thread)
+{
 #ifdef LISP_FEATURE_SB_THREAD
-#error "Define threading support functions"
-#else
-int arch_os_thread_init(struct thread *thread) {
+#warning "Check threading support functions"
+#endif
     return 1;                  /* success */
 }
-int arch_os_thread_cleanup(struct thread *thread) {
+
+int
+arch_os_thread_cleanup(struct thread *thread)
+{
+#ifdef LISP_FEATURE_SB_THREAD
+#warning "Check threading support functions"
+#endif
     return 1;                  /* success */
 }
-#endif
 
 os_context_register_t *
 os_context_register_addr(os_context_t *context, int offset)
 {
-    if (offset == 0) {
-       /* KLUDGE: I'm not sure, but it's possible that Linux puts the
-           contents of the Processor Status Word in the (wired-zero)
-           slot in the mcontext. In any case, the following is
-           unlikely to do any harm: */
-       static unsigned long long zero;
-       zero = 0;
-       return &zero;
-    } else {
-       return &(((struct sigcontext *) &(context->uc_mcontext))->sc_regs[offset]);
-    }
+    return &(((struct sigcontext *)&(context->uc_mcontext))->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]);
 }
 
 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);
+    return &(((struct sigcontext *)&(context->uc_mcontext))->sc_pc);
 }
 
 sigset_t *
@@ -82,7 +87,14 @@ os_context_sigmask_addr(os_context_t *context)
     return &(context->uc_sigmask);
 }
 
-void 
+unsigned int
+os_context_fp_control(os_context_t *context)
+{
+    /* FIXME: Probably do something. */
+    return 0;
+}
+
+void
 os_restore_fp_control(os_context_t *context)
 {
     /* FIXME: Probably do something. */
@@ -99,16 +111,40 @@ 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
 
-        return (((struct sigcontext *) &(context->uc_mcontext))->sc_cause 
-               & CAUSEF_BD);
+        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.  */
+    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:
+        return CAUSEF_BD;
+    }
     return 0;
 }
 
-void 
+void
 os_flush_icache(os_vm_address_t address, os_vm_size_t length)
 {
     if (cacheflush(address, length, ICACHE) == -1)
-       perror("cacheflush");
+        perror("cacheflush");
 }