0.9.0.7:

[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 f92a232..2cda92c 100644 (file)
--- a/src/runtime/mips-linux-os.c
+++ b/src/runtime/mips-linux-os.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
+#include "sbcl.h"
 #include "./signal.h"
 #include "os.h"
 #include "arch.h"
@@ -24,7 +25,6 @@
 #include "interrupt.h"
 #include "interr.h"
 #include "lispregs.h"
-#include "sbcl.h"
 #include <sys/socket.h>
 #include <sys/utsname.h>
 
@@ -34,36 +34,42 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "validate.h"
 /* for cacheflush() */
-#include <asm/cachectl.h>
+#include <sys/cachectl.h>
+
+#include "validate.h"
 
-/* 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]);
-    }
+    return &(((struct sigcontext *)&(context->uc_mcontext))->sc_regs[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 *
@@ -72,6 +78,12 @@ os_context_sigmask_addr(os_context_t *context)
     return &(context->uc_sigmask);
 }
 
+unsigned int
+os_context_fp_control(os_context_t *context)
+{
+    /* FIXME: Probably do something. */
+}
+
 void 
 os_restore_fp_control(os_context_t *context)
 {
@@ -83,8 +95,19 @@ 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
+
+       #include <asm/mipsregs.h>
+
+        return (((struct sigcontext *) &(context->uc_mcontext))->sc_cause 
+               & CAUSEF_BD);
+
+       out and return 0 always.  -- CSR, 2002-09-02 */
+    return 0;
 }
 
 void