Index: /branches/x8664-call/ccl/compiler/X86/x862.lisp
===================================================================
--- /branches/x8664-call/ccl/compiler/X86/x862.lisp	(revision 6322)
+++ /branches/x8664-call/ccl/compiler/X86/x862.lisp	(revision 6323)
@@ -6505,5 +6505,5 @@
         (x862-check-fixnum-overflow seg ($ x8664::arg_z) done)
         (@ out-of-line)
-        (! call-subprim-2 ($ x8664::arg_z) (subprim-name->offset '.SPbuiltin-minus) ($ x8664::arg_y) ($ x8664::arg_z))
+        (! xcall-subprim-2 ($ x8664::arg_z) (subprim-name->offset '.SPnbuiltin-minus) ($ x8664::arg_y) ($ x8664::arg_z))
         (@ done)
         (x862-copy-register seg target ($ x8664::arg_z)))
@@ -6544,5 +6544,5 @@
           (if otherform
             (x862-lri seg ($ x8664::arg_y) (ash (or fix1 fix2) *x862-target-fixnum-shift*)))
-          (! call-subprim-2 ($ x8664::arg_z) (subprim-name->offset '.SPbuiltin-plus) ($ x8664::arg_y) ($ x8664::arg_z))
+          (! xcall-subprim-2 ($ x8664::arg_z) (subprim-name->offset '.SPnbuiltin-plus) ($ x8664::arg_y) ($ x8664::arg_z))
           (@ done)
           (x862-copy-register seg target ($ x8664::arg_z)))
@@ -6708,5 +6708,5 @@
               (if otherform
                 (x862-lri seg ($ x8664::arg_y) (ash fixval x8664::fixnumshift)))
-              (! call-subprim-2 ($ x8664::arg_z) (subprim-name->offset '.SPbuiltin-logior) ($ x8664::arg_y) ($ x8664::arg_z))
+              (! xcall-subprim-2 ($ x8664::arg_z) (subprim-name->offset '.SPnbuiltin-logior) ($ x8664::arg_y) ($ x8664::arg_z))
               (@ done)
               (x862-copy-register seg target ($ x8664::arg_z)))
@@ -6753,5 +6753,5 @@
               (if otherform
                 (x862-lri seg ($ x8664::arg_y) (ash fixval x8664::fixnumshift)))
-              (! call-subprim-2 ($ x8664::arg_z) (subprim-name->offset '.SPbuiltin-logand) ($ x8664::arg_y) ($ x8664::arg_z))
+              (! xcall-subprim-2 ($ x8664::arg_z) (subprim-name->offset '.SPnbuiltin-logand) ($ x8664::arg_y) ($ x8664::arg_z))
               (@ done)
               (x862-copy-register seg target ($ x8664::arg_z)))