Index: /trunk/source/level-1/x86-trap-support.lisp
===================================================================
--- /trunk/source/level-1/x86-trap-support.lisp	(revision 13396)
+++ /trunk/source/level-1/x86-trap-support.lisp	(revision 13397)
@@ -188,7 +188,7 @@
   (defconstant gp-regs-offset 0)
   (defmacro xp-gp-regs (xp)
-    `(pref (pref ,xp :ucontext.uc_mcontext) :mcontext.ss))
-  (defun xp-mxcsr (xp)
-    (%get-unsigned-long (pref (pref xp :ucontext.uc_mcontext) :mcontext.fs) 32))
+    `(pref ,xp :ucontext_t.uc_mcontext.__ss))
+  (defun xp-mxcsr (xp)
+    (pref xp :ucontext_t.uc_mcontext.__fs.__fpu_mxcsr))
   (defconstant flags-register-offset 9)
   (defconstant eip-register-offset 10)