X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-linux-os.c;h=70f988e8f467df0b0c4e3681e93440fd5d0f2a8c;hb=37d3828773e2f847bb1ed7522b0af4fb8e736fc8;hp=f92a232718fda68a03ced95f56c97507289bcefd;hpb=4ae1b794a5d6a90794468cf8017f5307f2c30dfe;p=sbcl.git

diff --git a/src/runtime/mips-linux-os.c b/src/runtime/mips-linux-os.c
index f92a232..70f988e 100644
--- a/src/runtime/mips-linux-os.c
+++ b/src/runtime/mips-linux-os.c
@@ -15,55 +15,60 @@
  */
 
 #include <stdio.h>
-#include <sys/param.h>
-#include <sys/file.h>
-#include "./signal.h"
-#include "os.h"
-#include "arch.h"
-#include "globals.h"
-#include "interrupt.h"
-#include "interr.h"
-#include "lispregs.h"
-#include "sbcl.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>
 
-#include "validate.h"
 /* for cacheflush() */
-#include <asm/cachectl.h>
+#include <sys/cachectl.h>
+
+#include "sbcl.h"
+#include "os.h"
+#include "arch.h"
+
+#define CAUSEF_BD (1 << 31)
 
-/* FIXME: For CAUSEF_BD */
-#include <asm/mipsregs.h>
 size_t os_vm_page_size;
 
+int
+arch_os_thread_init(struct thread *thread)
+{
+#ifdef LISP_FEATURE_SB_THREAD
+#warning "Check threading support functions"
+#endif
+    return 1;                  /* success */
+}
+
+int
+arch_os_thread_cleanup(struct thread *thread)
+{
+#ifdef LISP_FEATURE_SB_THREAD
+#warning "Check threading support functions"
+#endif
+    return 1;                  /* success */
+}
 
 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]);
-    }
+    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 *
@@ -72,10 +77,20 @@ os_context_sigmask_addr(os_context_t *context)
     return &(context->uc_sigmask);
 }
 
-void 
+unsigned int
+os_context_fp_control(os_context_t *context)
+{
+    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
@@ -83,13 +98,35 @@ os_context_bd_cause(os_context_t *context)
 {
     /* We need to see if whatever happened, happened because of a
        branch delay event */
-    return (((struct sigcontext *) &(context->uc_mcontext))->sc_cause 
-	    & CAUSEF_BD);
+    /* FIXME: However, I'm not convinced that the values that Linux
+       puts in this slot are actually right; specifically, attempting
+       to compile sbcl with sbcl-0.7.7.7 lead to an "infinite SIGTRAP
+       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);
+
+       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;
 }
 
-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");
 }