1.0.46.43: fix sb-introspect on non-threaded builds

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

diff --git a/src/runtime/x86-bsd-os.c b/src/runtime/x86-bsd-os.c
index d493800..1054659 100644 (file)
--- a/src/runtime/x86-bsd-os.c
+++ b/src/runtime/x86-bsd-os.c
@@ -19,6 +19,15 @@
 #include "machine/npx.h"
 #endif
 
+#if defined(LISP_FEATURE_OPENBSD)
+#include <machine/npx.h>
+#include <stddef.h>
+#include "openbsd-sigcontext.h"
+#ifdef OS_OPENBSD_FPSTATE_IN_SIGFRAME
+# include <machine/frame.h>
+#endif
+#endif
+
 /* KLUDGE: There is strong family resemblance in the signal context
  * stuff in FreeBSD and OpenBSD, but in detail they're different in
  * almost every line of code. It would be nice to find some way to
@@ -156,7 +165,7 @@ int arch_os_thread_init(struct thread *thread) {
     struct segment_descriptor ldt_entry = { 0, 0, SDT_MEMRW, SEL_UPL, 1,
                                             0, 0, 1, 0, 0 };
 
-    set_data_desc_addr(&ldt_entry, (unsigned long) thread);
+    set_data_desc_addr(&ldt_entry, thread);
     set_data_desc_size(&ldt_entry, dynamic_values_bytes);
 
     n = i386_set_ldt(LDT_AUTO_ALLOC, (union descriptor*) &ldt_entry, 1);
@@ -226,8 +235,8 @@ os_restore_fp_control(os_context_t *context)
      * On earlier systems, it is shared in a whole process.
      */
 #if defined(__FreeBSD_version) && __FreeBSD_version >= 500040
-    struct envxmm *ex = (struct envxmm*)(&context->uc_mcontext.mc_fpstate);
-    asm ("fldcw %0" : : "m" (ex->en_cw));
+    struct envxmm *ex = (struct envxmm *)(context->uc_mcontext.mc_fpstate);
+    __asm__ __volatile__ ("fldcw %0" : : "m" (ex->en_cw));
 #endif
 #if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
     /* Calling this function here may not be good idea.  Or rename
@@ -237,3 +246,22 @@ os_restore_fp_control(os_context_t *context)
 #endif
 }
 #endif
+
+#if defined(LISP_FEATURE_OPENBSD)
+void
+os_restore_fp_control(os_context_t *context)
+{
+#ifdef OS_OPENBSD_FPSTATE_IN_SIGFRAME
+    struct sigframe *frame = (struct sigframe *)((char*)context -
+        offsetof(struct sigframe, sf_sc));
+    union savefpu *fpu = frame->sf_fpstate;
+#elif defined(OS_OPENBSD_FPSTATE_IN_SIGCONTEXT)
+    union savefpu *fpu = context->sc_fpstate;
+#endif
+
+    if (openbsd_use_fxsave)
+        __asm__ __volatile__ ("fldcw %0" : : "m" (fpu->sv_xmm.sv_env.en_cw));
+    else
+        __asm__ __volatile__ ("fldcw %0" : : "m" (fpu->sv_87.sv_env.en_cw));
+}
+#endif