X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fppc-linux-os.c;h=9df75610ee16213c9bb61a7ee2e80d3782c61473;hb=78fa16bf55be44cc16845be84d98023e83fb14bc;hp=9b806d3784d162f52f4e2e9dd8a32979706bb558;hpb=b7192afcef9bbfd3fe1a4e2bfe3c73f853d164d1;p=sbcl.git

diff --git a/src/runtime/ppc-linux-os.c b/src/runtime/ppc-linux-os.c
index 9b806d3..9df7561 100644
--- a/src/runtime/ppc-linux-os.c
+++ b/src/runtime/ppc-linux-os.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
+#include "sbcl.h"
 #include "./signal.h"
 #include "os.h"
 #include "arch.h"
@@ -25,7 +26,6 @@
 #include "interrupt.h"
 #include "interr.h"
 #include "lispregs.h"
-#include "sbcl.h"
 #include <sys/socket.h>
 #include <sys/utsname.h>
 
@@ -36,11 +36,10 @@
 #include <unistd.h>
 
 #include "validate.h"
+#include "ppc-linux-mcontext.h"
+
 size_t os_vm_page_size;
 
-struct thread *arch_os_get_current_thread() {
-    return all_threads;
-}
 int arch_os_thread_init(struct thread *thread) {
     return 1;			/* success */
 }
@@ -51,25 +50,41 @@ int arch_os_thread_cleanup(struct thread *thread) {
 os_context_register_t   *
 os_context_register_addr(os_context_t *context, int offset)
 {
+#if defined(GLIBC231_STYLE_UCONTEXT)
     return &((context->uc_mcontext.regs)->gpr[offset]);
+#elif defined(GLIBC232_STYLE_UCONTEXT)
+    return &((context->uc_mcontext.uc_regs->gregs)[offset]);
+#endif
 }
 
 os_context_register_t *
 os_context_pc_addr(os_context_t *context)
 {
+#if defined(GLIBC231_STYLE_UCONTEXT)
     return &((context->uc_mcontext.regs)->nip);
+#elif defined(GLIBC232_STYLE_UCONTEXT)
+    return &((context->uc_mcontext.uc_regs->gregs)[PT_NIP]);
+#endif
 }
 
 os_context_register_t *
 os_context_lr_addr(os_context_t *context)
 {
+#if defined(GLIBC231_STYLE_UCONTEXT)
     return &((context->uc_mcontext.regs)->link);
+#elif defined(GLIBC232_STYLE_UCONTEXT)
+    return &((context->uc_mcontext.uc_regs->gregs)[PT_LNK]);
+#endif
 }
 
 sigset_t *
 os_context_sigmask_addr(os_context_t *context)
 {
+#if defined(GLIBC231_STYLE_UCONTEXT)
     return &context->uc_sigmask;
+#elif defined(GLIBC232_STYLE_UCONTEXT)
+    return &context->uc_sigmask;
+#endif
 }
 
 unsigned long
@@ -80,43 +95,39 @@ os_context_fp_control(os_context_t *context)
        registers, and PT_FPSCR is an offset that is larger than 32
        (the number of ppc registers), but that happens to get the
        right answer. -- CSR, 2002-07-11 */
+#if defined(GLIBC231_STYLE_UCONTEXT)
     return context->uc_mcontext.regs->gpr[PT_FPSCR]; 
+#elif defined(GLIBC232_STYLE_UCONTEXT)
+    return context->uc_mcontext.uc_regs->gregs[PT_FPSCR]; 
+#endif
 }
 
 void 
 os_restore_fp_control(os_context_t *context)
 {
     unsigned long control;
+    double d;
     
     control = os_context_fp_control(context) & 
-      /* FIXME: Should we preserve the user's requested rounding mode?
-
-         Note that doing 
+	/* FIXME: Should we preserve the user's requested rounding mode?
 
-	 ~(FLOAT_STICKY_BITS_MASK | FLOAT_EXCEPTIONS_BYTE_MASK)
+	Note that doing 
+	
+	~(FLOAT_STICKY_BITS_MASK | FLOAT_EXCEPTIONS_BYTE_MASK)
+	
+	here leads to infinite SIGFPE for invalid operations, as
+	there are bits in the control register that need to be
+	cleared that are let through by that mask. -- CSR, 2002-07-16 */
 
-	 here leads to infinite SIGFPE for invalid operations, as
-	 there are bits in the control register that need to be
-	 cleared that are let through by that mask. -- CSR, 2002-07-16 */
-      FLOAT_TRAPS_BYTE_MASK;
+	FLOAT_TRAPS_BYTE_MASK;
     
-    /* FIXME: Shoot me now.
+    d = *((double *) &control);
+    /* Hmp.  Apparently the following doesn't work either:
        
-       Hardcoded nastiness: the "0"s below refer to the first floating
-       point registers -- we should let gcc deal with that. The 8(31)
-       refers to the position on the stack, less one, of control (we
-       need for control to be the high word of the double loaded by
-       lfd; how do I know that r31 contains the stack? I don't, I'm
-       just guessing. The 255, on the other hand, is a valid constant
-       -- it says "move everything in the upper word into the floating
-       point control register. -- CSR, 2002-07-16 */
-
-    /* FIXME: it appears that the above text is quite accurate, in the
-       sense that this
-
-    asm ("stw %0, 12(31); lfd 0, 8(31); mtfsf 255, 0" : : "r" (control) : "r31");
+    asm volatile ("mtfsf 0xff,%0" : : "f" (d));
 
-    no longer works. */
+    causing segfaults at the first GC.
+    */
 }
 
 void