Index: /branches/rme-logops/compiler/nx0.lisp
===================================================================
--- /branches/rme-logops/compiler/nx0.lisp	(revision 13884)
+++ /branches/rme-logops/compiler/nx0.lisp	(revision 13885)
@@ -589,4 +589,20 @@
          int)))
 
+(defun acode-natural-constant-p (x)
+  (let* ((int (or (acode-fixnum-form-p x)
+                  (progn
+                    (setq x (acode-unwrapped-form x))
+                    (if (acode-p x)
+                      (if (and (eq (acode-operator x) (%nx1-operator immediate))
+                               (typep (cadr x) 'fixnum))
+                        (cadr x)))))))
+    (and int
+         (target-word-size-case
+	  (32 (typep int '(unsigned-byte 32)))
+	  (64 (typep int '(unsigned-byte 64))))
+         int)))
+
+
+
 (defun acode-real-constant-p (x)
   (or (acode-fixnum-form-p x)
@@ -692,4 +708,15 @@
 (defun nx-acode-fixnum-type-p (form env)
     (acode-fixnum-type-p form (nx-trust-declarations env)))
+
+(defun acode-natural-type-p (form trust-decls)
+  (and trust-decls
+       (acode-p form)
+       (eq (acode-operator form) (%nx1-operator typed-form))
+       (subtypep (cadr form) (target-word-size-case
+			      (32 '(unsigned-byte 32))
+			      (64 '(unsigned-byte 64))))))
+
+(defun nx-acode-natural-type-p (form env)
+  (acode-natural-type-p form (nx-trust-declarations env)))
 
 ; Is acode-expression the result of alphatizing (%int-to-ptr <integer>) ?
@@ -2791,5 +2818,25 @@
       (t
        (make-acode (%nx1-operator logand2) form-1 form-2)))))
-	  
+
+(defun nx-logior-2-op (arg-1 arg-2 env)
+  (let* ((form-1 (nx1-form arg-1))
+	 (form-2 (nx1-form arg-2))
+	 (fix-1 (nx-acode-fixnum-type-p form-1 env))
+	 (fix-2 (nx-acode-fixnum-type-p form-2 env))
+	 (nat-1 (or (acode-natural-constant-p form-1)
+		    (nx-acode-natural-type-p form-1 env)))
+	 (nat-2 (or (acode-natural-constant-p form-2)
+		    (nx-acode-natural-type-p form-2 env))))
+    (cond
+      ((and fix-1 fix-2)
+       (make-acode (%nx1-operator %ilogior2) form-1 form-2))
+      ((and nat-1 nat-2)
+       (make-acode (%nx1-operator typed-form)
+		   (target-word-size-case
+		    (32 '(unsigned-byte 32))
+		    (64 '(unsigned-byte 64)))
+		   (make-acode (%nx1-operator %natural-logior) form-1 form-2)))
+      (t
+       (make-acode (%nx1-operator logior2) form-1 form-2)))))
 
 (defun nx-binary-boole-op (whole env arg-1 arg-2 fixop intop naturalop)
Index: /branches/rme-logops/compiler/nx1.lisp
===================================================================
--- /branches/rme-logops/compiler/nx1.lisp	(revision 13884)
+++ /branches/rme-logops/compiler/nx1.lisp	(revision 13885)
@@ -450,12 +450,6 @@
                 (nx1-form newvalue)))
 
-(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-logior-2 ((logior-2)) (&environment env arg-1 arg-2)
+  (nx-logior-2-op arg-1 arg-2 env))
 
 (defnx1 nx1-logxor-2 ((logxor-2)) (&whole w &environment env arg-1 arg-2)
@@ -470,14 +464,4 @@
 (defnx1 nx1-logand-2 ((logand-2)) (&environment env arg-1 arg-2)
   (nx-logand-2-op arg-1 arg-2 env))
-
-#+not-any-more
-(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)