0.7.13.3

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

diff --git a/src/runtime/x86-linux-os.c b/src/runtime/x86-linux-os.c
index ed7a9e0..30a44da 100644 (file)
--- a/src/runtime/x86-linux-os.c
+++ b/src/runtime/x86-linux-os.c
@@ -38,9 +38,6 @@
 #include "validate.h"
 size_t os_vm_page_size;
 
-#if defined GENCGC
-#include "gencgc.h"
-#endif
 
 /* KLUDGE: As of kernel 2.2.14 on Red Hat 6.2, there's code in the
  * <sys/ucontext.h> file to define symbolic names for offsets into
@@ -67,13 +64,26 @@ os_context_register_addr(os_context_t *context, int offset)
 os_context_register_t *
 os_context_pc_addr(os_context_t *context)
 {
-    return &context->uc_mcontext.gregs[14];
+    return &context->uc_mcontext.gregs[14]; /*  REG_EIP */
 }
 
 os_context_register_t *
 os_context_sp_addr(os_context_t *context)
+{                              
+    return &context->uc_mcontext.gregs[17]; /* REG_UESP */
+}
+
+os_context_register_t *
+os_context_fp_addr(os_context_t *context)
+{
+    return &context->uc_mcontext.gregs[6]; /* REG_EBP */
+}
+
+unsigned long
+os_context_fp_control(os_context_t *context)
 {
-    return &context->uc_mcontext.gregs[17];
+    return ((((context->uc_mcontext.fpregs->cw) & 0xffff) ^ 0x3f) |
+           (((context->uc_mcontext.fpregs->sw) & 0xffff) << 16));
 }
 
 sigset_t *
@@ -83,6 +93,12 @@ os_context_sigmask_addr(os_context_t *context)
 }
 
 void
+os_restore_fp_control(os_context_t *context)
+{
+    asm ("fldcw %0" : : "m" (context->uc_mcontext.fpregs->cw));
+}
+
+void
 os_flush_icache(os_vm_address_t address, os_vm_size_t length)
 {
 }