X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fpred.lisp;h=da77d6fe0cab9cb2db8a0c39453a86d44622c86a;hb=37d3828773e2f847bb1ed7522b0af4fb8e736fc8;hp=ce13f2b50049632ef08107dcb12bea9bd98b3e9c;hpb=d95f1e6476aa63695e018a7769a1ae9e002fca36;p=sbcl.git

diff --git a/src/compiler/x86/pred.lisp b/src/compiler/x86/pred.lisp
index ce13f2b..da77d6f 100644
--- a/src/compiler/x86/pred.lisp
+++ b/src/compiler/x86/pred.lisp
@@ -65,6 +65,10 @@
             ((unsigned-byte-32 unsigned-byte-31)
              unsigned-reg move-if/unsigned)
             (signed-byte-32 signed-reg move-if/signed)
+            ;; FIXME: Can't use CMOV with byte registers, and characters live
+            ;; in such outside of unicode builds. A better solution then just
+            ;; disabling MOVE-IF/CHAR should be possible, though.
+            #!+sb-unicode
             (character character-reg move-if/char)
 
             ((single-float complex-single-float
@@ -91,10 +95,6 @@
         (let ((scn (sc-number-or-lose representation)))
           (labels ((make-tn ()
                      (make-representation-tn ptype scn))
-                   (immediate-tn-p (tn)
-                     (and (eq (sb!c::tn-kind tn) :constant)
-                          (eq (sb!c::immediate-constant-sc (tn-value tn))
-                              (sc-number-or-lose 'immediate))))
                    (frob-tn (tn)
                      (if (immediate-tn-p tn)
                          tn
@@ -138,33 +138,27 @@
          (setf then temp))
        (inst cmov (first flags) res then))))
 
-(macrolet ((def-move-if (name type reg &optional stack)
-               (when stack (setf stack (list stack)))
-
+(macrolet ((def-move-if (name type reg stack)
                `(define-vop (,name move-if)
-                  (:args (then :scs (immediate ,reg ,@stack) :to :eval
+                  (:args (then :scs (immediate ,reg ,stack) :to :eval
                                :target temp
                                :load-if (not (or (sc-is then immediate)
-                                                 (and (sc-is then ,@stack)
+                                                 (and (sc-is then ,stack)
                                                       (not (location= else res))))))
-                         (else :scs (immediate ,reg ,@stack) :target res
-                               :load-if (not (sc-is else immediate ,@stack))))
+                         (else :scs (immediate ,reg ,stack) :target res
+                               :load-if (not (sc-is else immediate ,stack))))
                   (:arg-types ,type ,type)
                   (:results (res :scs (,reg)
                                  :from (:argument 1)))
                   (:result-types ,type))))
-  (def-move-if move-if/t
-      t descriptor-reg control-stack)
-  (def-move-if move-if/fx
-      tagged-num any-reg control-stack)
-  (def-move-if move-if/unsigned
-      unsigned-num unsigned-reg unsigned-stack)
-  (def-move-if move-if/signed
-      signed-num signed-reg signed-stack)
-  (def-move-if move-if/char
-      character character-reg character-stack)
-  (def-move-if move-if/sap
-      system-area-pointer sap-reg sap-stack))
+  (def-move-if move-if/t t descriptor-reg control-stack)
+  (def-move-if move-if/fx tagged-num any-reg control-stack)
+  (def-move-if move-if/unsigned unsigned-num unsigned-reg unsigned-stack)
+  (def-move-if move-if/signed signed-num signed-reg signed-stack)
+  ;; FIXME: See *CMOV-PTYPE-REPRESENTATION-VOP* above.
+  #!+sb-unicode
+  (def-move-if move-if/char character character-reg character-stack)
+  (def-move-if move-if/sap system-area-pointer sap-reg sap-stack))
 
 
 ;;;; conditional VOPs