Changeset 6737

Timestamp:

Jun 15, 2007, 12:20:07 PM (17 years ago)

Author:

Gary Byers

Message:

x862-numcmp: if both args fixnums ...
x862-inline-numcmp: don't reverse cr-bit if both args fixnums (shouldn't
get here if we're catching that upstream, but ...)

File:

• trunk/ccl/compiler/X86/x862.lisp (modified) (2 diffs)

trunk/ccl/compiler/X86/x862.lisp

@@ -6111 +6111 @@
             (x862-explicit-non-fixnum-type-p form2))
       (x862-binary-builtin seg vreg xfer name form1 form2)
-      (x862-inline-numcmp seg vreg xfer cc name form1 form2))))
+      (let* ((fix1 (acode-fixnum-form-p form1))
+             (fix2 (acode-fixnum-form-p form2)))
+        (if (and fix1 fix2)
+          (if (funcall name fix1 fix2)
+            (x862-t seg vreg xfer)
+            (x862-nil seg vreg xfer))
+          (x862-inline-numcmp seg vreg xfer cc name form1 form2))))))
 
 (defun x862-inline-numcmp (seg vreg xfer cc name form1 form2)
@@ -6141 +6147 @@
       (multiple-value-bind (cr-bit true-p) (acode-condition-to-x86-cr-bit cc)
         (when otherform
-          (unless (or fix2 (eq cr-bit x86::x86-e-bits))
+          (unless (or (and fix2 (not fix1)) (eq cr-bit x86::x86-e-bits))
             (setq cr-bit (x862-reverse-cr-bit cr-bit))))
         (if (not true-p)