Index: /trunk/ccl/lisp-kernel/x86-exceptions.h
===================================================================
--- /trunk/ccl/lisp-kernel/x86-exceptions.h	(revision 4941)
+++ /trunk/ccl/lisp-kernel/x86-exceptions.h	(revision 4942)
@@ -24,4 +24,15 @@
 #define xpPC(x) (xpGPR(x,Iip))
 #define xpMMXreg(x,n)  *((natural *)(&((x)->uc_mcontext.fpregs->_st[n])))
+#endif
+#endif
+
+#ifdef DARWIN
+#ifdef X8664
+#define xpGPRvector(x) ((natural *)(&(UC_MCONTEXT(x)->ss.rax)))
+#define xpGPR(x,gprno) (xpGPRvector(x)[gprno])
+#define set_xpGPR(x,gpr,new) xpGPR((x),(gpr)) = (natural)(new)
+#define xpPC(x) (xpGPR(x,Iip))
+#define xpFPRvector(x) ((natural *)(&(UC_MCONTEXT(x)->fs.fp_stmm0)))
+#define xpMMXreg(x,n)  (xpFPRvector(x)[gprno])
 #endif
 #endif