Index: /trunk/ccl/compiler/X86/X8664/x8664-vinsns.lisp
===================================================================
--- /trunk/ccl/compiler/X86/X8664/x8664-vinsns.lisp	(revision 4958)
+++ /trunk/ccl/compiler/X86/X8664/x8664-vinsns.lisp	(revision 4959)
@@ -773,11 +773,11 @@
                           ((car :lisp)
                            (cdr :lisp)))
-  (subq (:$b (- x8664::cons.size x8664::fulltag-cons)) (:@ (:%seg x8664::rcontext) x8664::tcr.save-allocptr))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.save-allocptr) (:%q x8664::allocptr))
-  (rcmpq (:%q x8664::allocptr) (:@ (:%seg x8664::rcontext) x8664::tcr.save-allocbase))
+  (subq (:$b (- x8664::cons.size x8664::fulltag-cons)) (:@ (:%seg :rcontext) x8664::tcr.save-allocptr))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.save-allocptr) (:%q x8664::allocptr))
+  (rcmpq (:%q x8664::allocptr) (:@ (:%seg :rcontext) x8664::tcr.save-allocbase))
   (jg :no-trap)
   (uuo-alloc)
   :no-trap
-  (andb (:$b (lognot x8664::fulltagmask)) (:@ (:%seg x8664::rcontext) x8664::tcr.save-allocptr))
+  (andb (:$b (lognot x8664::fulltagmask)) (:@ (:%seg :rcontext) x8664::tcr.save-allocptr))
   (movq (:%q car) (:@ x8664::cons.car (:%q x8664::allocptr)))
   (movq (:%q cdr) (:@ x8664::cons.cdr (:%q x8664::allocptr)))
@@ -1036,12 +1036,12 @@
                                        ((header (:u64 #.x8664::imm0))
                                         (freeptr (:lisp #.x8664::allocptr))))
-  (subq (:%q x8664::imm1) (:@ (:%seg x8664::rcontext) x8664::tcr.save-allocptr))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.save-allocptr) (:%q freeptr))
-  (rcmpq (:%q freeptr) (:@ (:%seg x8664::rcontext) x8664::tcr.save-allocbase))
+  (subq (:%q x8664::imm1) (:@ (:%seg :rcontext) x8664::tcr.save-allocptr))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.save-allocptr) (:%q freeptr))
+  (rcmpq (:%q freeptr) (:@ (:%seg :rcontext) x8664::tcr.save-allocbase))
   (jg :no-trap)
   (uuo-alloc)
   :no-trap
   (movq (:%q header) (:@ x8664::misc-header-offset (:%q freeptr)))
-  (andb (:$b (lognot x8664::fulltagmask)) (:@ (:%seg x8664::rcontext) x8664::tcr.save-allocptr))
+  (andb (:$b (lognot x8664::fulltagmask)) (:@ (:%seg :rcontext) x8664::tcr.save-allocptr))
   ((:not (:pred = freeptr
                 (:apply %hard-regspec-value dest)))
@@ -1532,11 +1532,11 @@
 				   ((car :lisp) (cdr :lisp))
 				   ((temp :imm)))
-  (subq (:$b (+ x8664::cons.size x8664::dnode-size)) (:@ (:%seg x8664::rcontext) x8664::tcr.next-tsp))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.next-tsp) (:%q temp))
+  (subq (:$b (+ x8664::cons.size x8664::dnode-size)) (:@ (:%seg :rcontext) x8664::tcr.next-tsp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.next-tsp) (:%q temp))
   (movapd (:%xmm x8664::fpzero) (:@ (:%q temp)))
   (movapd (:%xmm x8664::fpzero) (:@ 16 (:%q temp)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.save-tsp) (:%mmx x8664::stack-temp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.save-tsp) (:%mmx x8664::stack-temp))
   (movq (:%mmx x8664::stack-temp) (:@ (:%q temp)))
-  (movq (:%q temp) (:@ (:%seg x8664::rcontext) x8664::tcr.save-tsp))
+  (movq (:%q temp) (:@ (:%seg :rcontext) x8664::tcr.save-tsp))
   (leaq (:@ (+ x8664::dnode-size x8664::fulltag-cons) (:%q temp)) (:%q temp))
   (movq (:%q car) (:@ x8664::cons.car (:%q temp)))
@@ -1552,11 +1552,11 @@
          (:pred <= (:apply + aligned-size x8664::dnode-size) 127))
    (subq (:$b (:apply + aligned-size x8664::dnode-size))
-         (:@ (:%seg x8664::rcontext) x8664::tcr.next-tsp)))
+         (:@ (:%seg :rcontext) x8664::tcr.next-tsp)))
   ((:not (:and (:pred >= (:apply + aligned-size x8664::dnode-size) -128)
                (:pred <= (:apply + aligned-size x8664::dnode-size) 127)))
    (subq (:$l (:apply + aligned-size x8664::dnode-size))
-         (:@ (:%seg x8664::rcontext) x8664::tcr.next-tsp)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.save-tsp) (:%q tempb))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.next-tsp) (:%q tempa))
+         (:@ (:%seg :rcontext) x8664::tcr.next-tsp)))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.save-tsp) (:%q tempb))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.next-tsp) (:%q tempa))
   (movd (:%q tempb) (:%mmx x8664::stack-temp))
   :loop
@@ -1566,5 +1566,5 @@
   (jnz :loop)
   (movq (:%mmx x8664::stack-temp) (:@ (:%q tempa)))
-  (movq (:%q tempa) (:@ (:%seg x8664::rcontext) x8664::tcr.save-tsp))
+  (movq (:%q tempa) (:@ (:%seg :rcontext) x8664::tcr.save-tsp))
   (movl (:$l header) (:@ x8664::dnode-size (:%q tempa)))
   (leaq (:@ (+ x8664::dnode-size x8664::fulltag-misc) (:%q tempa)) (:%q dest)))
@@ -1574,8 +1574,8 @@
 					()
                                         ((temp :imm)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.save-tsp) (:%q temp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.save-tsp) (:%q temp))
   (movq (:@ (:%q temp)) (:%q temp))
-  (movq (:%q temp) (:@ (:%seg x8664::rcontext) x8664::tcr.save-tsp))
-  (movq (:%q temp) (:@ (:%seg x8664::rcontext) x8664::tcr.next-tsp))
+  (movq (:%q temp) (:@ (:%seg :rcontext) x8664::tcr.save-tsp))
+  (movq (:%q temp) (:@ (:%seg :rcontext) x8664::tcr.next-tsp))
   )
 
@@ -1583,7 +1583,7 @@
                                      ()
                                      ((temp :imm)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q temp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q temp))
   (movq (:@ (:%q temp)) (:%q temp))
-  (movq (:%q temp) (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp)))
+  (movq (:%q temp) (:@ (:%seg :rcontext) x8664::tcr.foreign-sp)))
 
   
@@ -1732,6 +1732,6 @@
                                                (idx :imm)))
   (movq (:@ x8664::symbol.binding-index (:%q src)) (:%q idx))
-  (rcmpq (:%q idx) (:@ (:%seg x8664::rcontext) x8664::tcr.tlb-limit))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.tlb-pointer) (:%q table))
+  (rcmpq (:%q idx) (:@ (:%seg :rcontext) x8664::tcr.tlb-limit))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.tlb-pointer) (:%q table))
   (jae :symbol)
   (movq (:@ (:%q table) (:%q idx)) (:%q dest))
@@ -1761,6 +1761,6 @@
                                                (idx :imm)))
   (movq (:@ x8664::symbol.binding-index (:%q src)) (:%q idx))
-  (rcmpq (:%q idx) (:@ (:%seg x8664::rcontext) x8664::tcr.tlb-limit))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.tlb-pointer) (:%q table))
+  (rcmpq (:%q idx) (:@ (:%seg :rcontext) x8664::tcr.tlb-limit))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.tlb-pointer) (:%q table))
   (jae :symbol)
   (movq (:@ (:%q table) (:%q idx)) (:%q dest))
@@ -1774,5 +1774,5 @@
                                          ()
                                          ((temp :u64)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.tlb-pointer) (:%q temp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.tlb-pointer) (:%q temp))
   (movq (:@ x8664::INTERRUPT-LEVEL-BINDING-INDEX (:%q temp)) (:%q dest)))
 
@@ -1834,7 +1834,7 @@
     (()
      ((w :u64)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%mmx x8664::stack-temp))  
-  (subq (:$b 16) (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))  
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%mmx x8664::stack-temp))  
+  (subq (:$b 16) (:@ (:%seg :rcontext) x8664::tcr.foreign-sp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))  
   (movq (:%mmx x8664::stack-temp) (:@ (:%q x8664::ra0)))
   (movq (:%q w) (:@ 8 (:%q x8664::ra0))))
@@ -1845,11 +1845,11 @@
          ((w :lisp))
          ((temp :imm)))
-  (subq (:$b (* 2 x8664::dnode-size)) (:@ (:%seg x8664::rcontext) x8664::tcr.next-tsp))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.save-tsp) (:%mmx x8664::stack-temp))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.next-tsp) (:%q temp))
+  (subq (:$b (* 2 x8664::dnode-size)) (:@ (:%seg :rcontext) x8664::tcr.next-tsp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.save-tsp) (:%mmx x8664::stack-temp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.next-tsp) (:%q temp))
   (movapd (:%xmm x8664::fpzero) (:@ (:%q temp)))
   (movapd (:%xmm x8664::fpzero) (:@ 16 (:%q temp)))
   (movq (:%mmx x8664::stack-temp) (:@ (:%q temp)))
-  (movq (:%q temp) (:@ (:%seg x8664::rcontext) x8664::tcr.save-tsp))
+  (movq (:%q temp) (:@ (:%seg :rcontext) x8664::tcr.save-tsp))
   (movq (:%q w) (:@ x8664::dnode-size (:%q temp))))
 
@@ -1857,7 +1857,7 @@
     (()
      ((f :double-float)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%mmx x8664::stack-temp))  
-  (subq (:$b 16) (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))  
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%mmx x8664::stack-temp))  
+  (subq (:$b 16) (:@ (:%seg :rcontext) x8664::tcr.foreign-sp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))  
   (movq (:%mmx x8664::stack-temp) (:@ (:%q x8664::ra0)))
   (movsd (:%xmm f) (:@ 8 (:%q x8664::ra0))))
@@ -1879,7 +1879,7 @@
     (((w :u64))
      ())
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
   (movq (:@ 8 (:%q x8664::ra0)) (:%q w))
-  (addq (:$b 16) (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp)))
+  (addq (:$b 16) (:@ (:%seg :rcontext) x8664::tcr.foreign-sp)))
 
 
@@ -1888,16 +1888,16 @@
          ()
          ((temp :imm)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.save-tsp) (:%q temp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.save-tsp) (:%q temp))
   (movq (:@ x8664::dnode-size (:%q temp)) (:%q w))
   (movq (:@ (:%q temp)) (:%q temp))
-  (movq (:%q temp) (:@ (:%seg x8664::rcontext) x8664::tcr.save-tsp))  
-  (movq (:%q temp) (:@ (:%seg x8664::rcontext) x8664::tcr.next-tsp)))
+  (movq (:%q temp) (:@ (:%seg :rcontext) x8664::tcr.save-tsp))  
+  (movq (:%q temp) (:@ (:%seg :rcontext) x8664::tcr.next-tsp)))
 
 (define-x8664-vinsn (temp-pop-double-float :pop :word :csp)
     (((f :double-float))
      ())
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
   (movsd (:@ 8 (:%q x8664::ra0)) (:%xmm f))
-  (addq (:$b 16) (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp)))
+  (addq (:$b 16) (:@ (:%seg :rcontext) x8664::tcr.foreign-sp)))
 
 
@@ -1905,7 +1905,7 @@
 (define-x8664-vinsn macptr->stack (((dest :lisp))
                                    ((ptr :address)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%mmx x8664::stack-temp))
-  (subq (:$b (+ 16 x8664::macptr.size)) (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%mmx x8664::stack-temp))
+  (subq (:$b (+ 16 x8664::macptr.size)) (:@ (:%seg :rcontext) x8664::tcr.foreign-sp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
   (movq (:%mmx x8664::stack-temp) (:@ (:%q x8664::ra0)))
   (leaq (:@ (+ 16 x8664::fulltag-misc) (:%q  x8664::ra0)) (:%q dest))
@@ -2880,5 +2880,5 @@
 (define-x8664-vinsn %current-tcr (((dest :lisp))
                                  ())
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.linear) (:%q dest)))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.linear) (:%q dest)))
 
 (define-x8664-vinsn (setq-special :call :subprim-call)
@@ -3133,10 +3133,10 @@
 (define-x8664-vinsn alloc-c-frame (()
                                    ((nbytes :u32const)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%mmx x8664::stack-temp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%mmx x8664::stack-temp))
   ((:pred < nbytes 128)
-   (subq (:$b nbytes) (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp)))
+   (subq (:$b nbytes) (:@ (:%seg :rcontext) x8664::tcr.foreign-sp)))
   ((:not (:pred < nbytes 128))
-   (subq (:$l nbytes) (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
+   (subq (:$l nbytes) (:@ (:%seg :rcontext) x8664::tcr.foreign-sp)))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
   (movq (:%mmx x8664::stack-temp) (:@ (:%q x8664::ra0))))
 
@@ -3147,7 +3147,7 @@
   (andb (:$b (lognot x8664::fulltagmask)) (:%b size))
 
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%mmx x8664::stack-temp))
-  (subq (:%q size) (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%mmx x8664::stack-temp))
+  (subq (:%q size) (:@ (:%seg :rcontext) x8664::tcr.foreign-sp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
   (movq (:%mmx x8664::stack-temp) (:@ (:%q x8664::ra0))))
 
@@ -3155,5 +3155,5 @@
                                ((arg :u64)
                                 (offset :u32const)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
   (movq (:%q arg) (:@ (:apply + 16 (:apply ash offset 3)) (:%q x8664::ra0))))
 
@@ -3161,10 +3161,10 @@
                                       ((arg :single-float)
                                        (offset :u32const)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
   (movss (:%xmm arg) (:@ (:apply + 16 (:apply ash offset 3)) (:%q x8664::ra0))))
 
 (define-x8664-vinsn reload-single-c-arg (((arg :single-float))
                                          ((offset :u32const)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
   (movss (:@ (:apply + 16 (:apply ash offset 3)) (:%q x8664::ra0)) (:%xmm arg)))
 
@@ -3172,10 +3172,10 @@
                                       ((arg :double-float)
                                        (offset :u32const)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
   (movsd (:%xmm arg) (:@ (:apply + 16 (:apply ash offset 3)) (:%q x8664::ra0))))
 
 (define-x8664-vinsn reload-double-c-arg (((arg :double-float))
                                          ((offset :u32const)))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q x8664::ra0))
   (movsd (:@ (:apply + 16 (:apply ash offset 3)) (:%q x8664::ra0)) (:%xmm arg)))
 
@@ -3201,11 +3201,11 @@
 				    ((closed :lisp))
 				    ((temp :imm)))
-  (subq (:$b (+ x8664::value-cell.size x8664::dnode-size)) (:@ (:%seg x8664::rcontext) x8664::tcr.next-tsp))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.save-tsp) (:%mmx x8664::stack-temp))
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.next-tsp) (:%q temp))
+  (subq (:$b (+ x8664::value-cell.size x8664::dnode-size)) (:@ (:%seg :rcontext) x8664::tcr.next-tsp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.save-tsp) (:%mmx x8664::stack-temp))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.next-tsp) (:%q temp))
   (movapd (:%xmm x8664::fpzero) (:@ (:%q temp)))
   (movapd (:%xmm x8664::fpzero) (:@ x8664::dnode-size (:%q temp)))
   (movq (:%mmx x8664::stack-temp) (:@ (:%q temp))) 
-  (movq (:%q temp) (:@ (:%seg x8664::rcontext) x8664::tcr.save-tsp))  
+  (movq (:%q temp) (:@ (:%seg :rcontext) x8664::tcr.save-tsp))  
   (movq (:$l x8664::value-cell-header) (:@ x8664::dnode-size (:%q temp)))
   (movq (:%q closed) (:@ (+ x8664::dnode-size x8664::node-size) (:%q temp)))
@@ -3277,5 +3277,5 @@
 (define-x8664-vinsn %foreign-stack-pointer (((dest :imm))
                                             ())
-  (movq (:@ (:%seg x8664::rcontext) x8664::tcr.foreign-sp) (:%q dest)))
+  (movq (:@ (:%seg :rcontext) x8664::tcr.foreign-sp) (:%q dest)))
 
 
@@ -3708,5 +3708,5 @@
 (define-x8664-vinsn event-poll (()
                                 ())
-  (btrq (:$ub 63) (:@ (:%seg x8664::rcontext) x8664::tcr.interrupt-pending))
+  (btrq (:$ub 63) (:@ (:%seg :rcontext) x8664::tcr.interrupt-pending))
   (jae :no-interrupt)
   (ud2a)