Changeset 15149

Timestamp:

Dec 21, 2011, 2:28:20 PM (13 years ago)

Author:

Gary Byers

Message:

If the result of a "natural" arithmetic/logical operation is a
constant (as may be evident during late constant-folding), use
new function X862-NATURAL-CONSTANT to process it (and decide
whether to box, etc.)

Fixes ticket:899 in the trunk. Need to check PPC, ARM backends
to see if they have the same bug.

File:

• trunk/source/compiler/X86/x862.lisp (modified) (6 diffs)

trunk/source/compiler/X86/x862.lisp

@@ -5030 +5030 @@
     (^)))
 
+(defun x862-natural-constant (seg vreg xfer value)
+  (x862-use-operator 
+   (if (typep value *nx-target-fixnum-type*)
+     (%nx1-operator fixnum)
+     (%nx1-operator immediate))
+   seg vreg xfer value))
+
+
 
 
@@ -10473 +10481 @@
            (fix-y (acode-fixnum-form-p y)))
       (if (and fix-x fix-y)
-        (x862-absolute-natural seg vreg xfer (+ fix-x fix-y))
+        (x862-natural-constant seg vreg xfer (+ fix-x fix-y))
         (let* ((u31x (and (typep fix-x '(unsigned-byte 31)) fix-x))
                (u31y (and (typep fix-y '(unsigned-byte 31)) fix-y)))
@@ -10498 +10506 @@
            (fix-y (acode-fixnum-form-p y)))
       (if (and fix-x fix-y)
-        (x862-absolute-natural seg vreg xfer (- fix-x fix-y))
+        (x862-natural-constant seg vreg xfer (- fix-x fix-y))
         (let* ((u31y (and (typep fix-y '(unsigned-byte 31)) fix-y)))
           (if (not u31y)
@@ -10522 +10530 @@
            (naturaly (nx-natural-constant-p y)))
       (if (and naturalx naturaly) 
-        (x862-absolute-natural seg vreg xfer (logior naturalx naturaly))
+        (x862-natural-constant seg vreg xfer (logior naturalx naturaly))
         (let* ((u31x (nx-u31-constant-p x))
                (u31y (nx-u31-constant-p y))
@@ -10548 +10556 @@
            (naturaly (nx-natural-constant-p y)))
       (if (and naturalx naturaly) 
-        (x862-absolute-natural seg vreg xfer (logxor naturalx naturaly))
+        (x862-natural-constant seg vreg xfer (logxor naturalx naturaly))
         (let* ((u32x (nx-u32-constant-p x))
                (u32y (nx-u32-constant-p y))
@@ -10573 +10581 @@
     (let* ((naturalx (nx-natural-constant-p x))
            (naturaly (nx-natural-constant-p y)))
-      (if (and naturalx naturaly) 
-        (x862-absolute-natural seg vreg xfer (logand naturalx naturaly))
+      (if (and naturalx naturaly)        
+        (x862-natural-constant seg vreg xfer (logand naturalx naturaly))
         (let* ((u31x (nx-u31-constant-p x))
                (u31y (nx-u31-constant-p y))