Index: /branches/ia32/compiler/X86/x862.lisp
===================================================================
--- /branches/ia32/compiler/X86/x862.lisp	(revision 8260)
+++ /branches/ia32/compiler/X86/x862.lisp	(revision 8261)
@@ -5820,5 +5820,9 @@
 (defun x862-ternary-builtin (seg vreg xfer name form1 form2 form3)
   (with-x86-local-vinsn-macros (seg)
-    (x862-three-targeted-reg-forms seg form1 ($ x8664::arg_x) form2 ($ *x862-arg-y*) form3 ($ *x862-arg-z*))
+    (x862-three-targeted-reg-forms seg form1 (target-arch-case
+					      (:x8632 ($ x8632::temp0))
+					      (:x8664 ($ x8664::arg_x)))
+					      form2 ($ *x862-arg-y*)
+					      form3 ($ *x862-arg-z*))
     (x862-fixed-call-builtin seg vreg xfer name (subprim-name->offset '.SPcallbuiltin3))))
 
@@ -6484,5 +6488,7 @@
   (multiple-value-bind (src unscaled-idx char)
       (x862-three-untargeted-reg-forms seg
-                                       str x8664::arg_x
+                                       str (target-arch-case
+					    (:x8632 x8632::temp0)
+					    (:x8664 x8664::arg_x))
                                        idx *x862-arg-y*
                                        char *x862-arg-z*)
@@ -6725,5 +6731,10 @@
 
 (defx862 x862-uvset uvset (seg vreg xfer vector index value)
-  (x862-three-targeted-reg-forms seg vector ($ x8664::arg_x) index ($ *x862-arg-y*) value ($ *x862-arg-z*))
+  (x862-three-targeted-reg-forms seg
+				 vector (target-arch-case
+					 (:x8632 x8632::temp0)
+					 (:x8664 x8664::arg_x))
+				 index ($ *x862-arg-y*)
+				 value ($ *x862-arg-z*))
   (! misc-set)
   (<- ($ *x862-arg-z*))
@@ -8472,5 +8483,10 @@
       (x862-vref seg vreg xfer type-keyword uvector index (unless *x862-reckless* (nx-lookup-target-uvector-subtag type-keyword)))
       (progn
-        (x862-three-targeted-reg-forms seg subtag ($ x8664::arg_x) uvector ($ *x862-arg-y*) index ($ *x862-arg-z*))
+        (x862-three-targeted-reg-forms seg
+				       subtag (target-arch-case
+					       (:x8632 ($ x8632::temp0))
+					       (:x8664 ($ x8664::arg_x)))
+				       uvector ($ *x862-arg-y*)
+				       index ($ *x862-arg-z*))
         (! subtag-misc-ref)
         (when vreg (<- ($ *x862-arg-z*)))