Index: /trunk/ccl/level-1/x86-trap-support.lisp
===================================================================
--- /trunk/ccl/level-1/x86-trap-support.lisp	(revision 5012)
+++ /trunk/ccl/level-1/x86-trap-support.lisp	(revision 5013)
@@ -61,4 +61,35 @@
       5                                 ;r8
       6                                 ;r9
+      10				;r10
+      11                                ;r11
+      12				;r12
+      13				;r13
+      14				;r14
+      15                                ;r15
+      )))
+
+#+darwinx8664-target
+(progn
+  (eval-when (:compile-toplevel :execute)
+    (or (load-record :mcontext64)
+        (def-foreign-type nil
+            (:struct :mcontext64
+                     (:es :x86_exception_state64_t)
+                     (:ss :x86_thread_state64_t)
+                     (:fs :x86_float_state64_t)))))
+  (defconstant gp-regs-offset (+ (get-field-offset :ucontext64.uc_mcontext64)
+                                 (get-field-offset :mcontext64.ss)))
+  (defconstant flags-register-offset 17)
+  (defparameter *encoded-gpr-to-indexed-gpr*
+    #(0					;rax
+      2					;rcx
+      3					;rdx
+      1					;rbx
+      7                                 ;rsp
+      6					;rbp
+      5                                 ;rsi
+      4                                 ;rdi
+      8                                 ;r8
+      9                                 ;r9
       10				;r10
       11                                ;r11