Changeset 14047

Timestamp:

Jul 26, 2010, 1:31:03 PM (14 years ago)

Author:

R. Matthew Emerson

Message:

Undo, for the time being, the effects of r13887.

Those changes are supposed to exploit more cases where LOGAND and
LOGIOR are applied to natural-sized operands, but the changes
are buggy. See ticket:708.

File:

• trunk/source/compiler/nx1.lisp (modified) (2 diffs)

trunk/source/compiler/nx1.lisp

@@ -450 +450 @@
                 (nx1-form newvalue)))
 
-(defnx1 nx1-logior-2 ((logior-2)) (&environment env arg-1 arg-2)
-  (nx-logior-2-op arg-1 arg-2 env))
+(defnx1 nx1-logior-2 ((logior-2)) (&whole w &environment env arg-1 arg-2)
+  (nx-binary-boole-op w
+                      env
+                      arg-1
+                      arg-2
+                      (%nx1-operator %ilogior2)
+                      (%nx1-operator logior2)
+                      (%nx1-operator %natural-logior)))
 
 (defnx1 nx1-logxor-2 ((logxor-2)) (&whole w &environment env arg-1 arg-2)
@@ -462 +468 @@
                       (%nx1-operator %natural-logxor)))
 
-(defnx1 nx1-logand-2 ((logand-2)) (&environment env arg-1 arg-2)
-  (nx-logand-2-op arg-1 arg-2 env))
+(defnx1 nx1-logand-2 ((logand-2)) (&whole w &environment env arg-1 arg-2)
+  (nx-binary-boole-op w
+                      env
+                      arg-1
+                      arg-2
+                      (%nx1-operator %ilogand2)
+                      (%nx1-operator logand2)
+                      (%nx1-operator %natural-logand)))
 
 (defnx1 nx1-require ((require-simple-vector)