fix compilation on freebsd

diff --git a/vm/os-freebsd-x86.32.hpp b/vm/os-freebsd-x86.32.hpp
index e386532b0c7ea23af57e09c1275d37c321d11417..800b343dfd6a0bfbb6c045ee9826536f7d60b801 100644 (file)
--- a/vm/os-freebsd-x86.32.hpp
+++ b/vm/os-freebsd-x86.32.hpp
@@ -13,12 +13,12 @@ inline static void *ucontext_stack_pointer(void *uap)
 inline static unsigned int uap_fpu_status(void *uap)
 {
         ucontext_t *ucontext = (ucontext_t *)uap;
-        if (uap->uc_mcontext.mc_fpformat == _MC_FPFMT_387) {
+        if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_387) {
             struct save87 *x87 = (struct save87 *)(&ucontext->uc_mcontext.mc_fpstate);
-            return x87->en_sw;
-        } else if (uap->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM) {
+            return x87->sv_env.en_sw;
+        } else if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM) {
             struct savexmm *xmm = (struct savexmm *)(&ucontext->uc_mcontext.mc_fpstate);
-            return xmm->en_sw | xmm->en_mxcsr;
+            return xmm->sv_env.en_sw | xmm->sv_env.en_mxcsr;
         } else
             return 0;
 }
@@ -28,11 +28,11 @@ inline static void uap_clear_fpu_status(void *uap)
         ucontext_t *ucontext = (ucontext_t *)uap;
         if (uap->uc_mcontext.mc_fpformat == _MC_FPFMT_387) {
             struct save87 *x87 = (struct save87 *)(&ucontext->uc_mcontext.mc_fpstate);
-            x87->en_sw = 0;
+            x87->sv_env.en_sw = 0;
         } else if (uap->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM) {
             struct savexmm *xmm = (struct savexmm *)(&ucontext->uc_mcontext.mc_fpstate);
-            xmm->en_sw = 0;
-            xmm->en_mxcsr &= 0xffffffc0;
+            xmm->sv_env.en_sw = 0;
+            xmm->sv_env.en_mxcsr &= 0xffffffc0;
         }
 }
 

diff --git a/vm/os-freebsd-x86.64.hpp b/vm/os-freebsd-x86.64.hpp
index 78c08447bd337b5d97bf7ecd7af7056e2933f55e..b2dd0961370f57aad3acaab79766a3989b65f2a3 100644 (file)
--- a/vm/os-freebsd-x86.64.hpp
+++ b/vm/os-freebsd-x86.64.hpp
@@ -13,9 +13,9 @@ inline static void *ucontext_stack_pointer(void *uap)
 inline static unsigned int uap_fpu_status(void *uap)
 {
         ucontext_t *ucontext = (ucontext_t *)uap;
-        if (uap->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM) {
+        if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM) {
             struct savexmm *xmm = (struct savexmm *)(&ucontext->uc_mcontext.mc_fpstate);
-            return xmm->en_sw | xmm->en_mxcsr;
+            return xmm->sv_env.en_sw | xmm->sv_env.en_mxcsr;
         } else
             return 0;
 }
@@ -23,10 +23,10 @@ inline static unsigned int uap_fpu_status(void *uap)
 inline static void uap_clear_fpu_status(void *uap)
 {
         ucontext_t *ucontext = (ucontext_t *)uap;
-        if (uap->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM) {
+        if (ucontext->uc_mcontext.mc_fpformat == _MC_FPFMT_XMM) {
             struct savexmm *xmm = (struct savexmm *)(&ucontext->uc_mcontext.mc_fpstate);
-            xmm->en_sw = 0;
-            xmm->en_mxcsr &= 0xffffffc0;
+            xmm->sv_env.en_sw = 0;
+            xmm->sv_env.en_mxcsr &= 0xffffffc0;
         }
 }