X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Farith.lisp;h=b39ba7b151566b1e2d8c5cf0d9add3d957c9aa31;hb=80f222325e1f677e5cf8de01c6990906fa47f65d;hp=fccb1f049cbfef3149b5f341ba42b1a6312a8545;hpb=4ed3f0d08c3a57a6762018d9622f253ab9d0f2b6;p=sbcl.git

diff --git a/src/compiler/alpha/arith.lisp b/src/compiler/alpha/arith.lisp
index fccb1f0..b39ba7b 100644
--- a/src/compiler/alpha/arith.lisp
+++ b/src/compiler/alpha/arith.lisp
@@ -94,12 +94,12 @@
 (define-vop (fast-signed-c-binop fast-signed-binop)
   (:args (x :target r :scs (signed-reg)))
   (:info y)
-  (:arg-types tagged-num (:constant integer)))
+  (:arg-types signed-num (:constant integer)))
 
 (define-vop (fast-unsigned-c-binop fast-unsigned-binop)
   (:args (x :target r :scs (unsigned-reg)))
   (:info y)
-  (:arg-types tagged-num (:constant integer)))
+  (:arg-types unsigned-num (:constant integer)))
 
 (defmacro define-binop (translate cost untagged-cost op 
 		        tagged-type untagged-type
@@ -139,6 +139,8 @@
      ,@(when (and tagged-type (not arg-swap))
 	 `((define-vop (,(symbolicate "FAST-" translate "-C/FIXNUM=>FIXNUM")
 			fast-fixnum-c-binop)
+	     (:args (x ,@(unless restore-fixnum-mask `(:target r)) 
+		       :scs (any-reg)))
 	     (:arg-types tagged-num (:constant ,tagged-type))
 	     ,@(when restore-fixnum-mask
 		 `((:temporary (:sc non-descriptor-reg) temp)))
@@ -207,10 +209,10 @@
     (inst bne temp done)
     (move zero-tn result)
     (inst br zero-tn done)
-      
+
     POSITIVE
     (inst sll number amount result)
-      
+
     DONE))
 
 (define-vop (fast-ash/signed=>signed)
@@ -232,10 +234,10 @@
     (inst bne temp done)
     (inst sra number 63 result)
     (inst br zero-tn done)
-      
+
     POSITIVE
     (inst sll number amount result)
-      
+
     DONE))
 
 (define-vop (fast-ash-c/signed=>signed)
@@ -292,6 +294,18 @@
   (:translate logcount)
   (:note "inline (unsigned-byte 64) logcount")
   (:policy :fast-safe)
+  (:args (arg :scs (unsigned-reg)))
+  (:arg-types unsigned-num)
+  (:results (res :scs (unsigned-reg)))
+  (:result-types positive-fixnum)
+  (:guard (member :cix *backend-subfeatures*))
+  (:generator 1
+    (inst ctpop zero-tn arg res)))
+
+(define-vop (unsigned-byte-64-count)
+  (:translate logcount)
+  (:note "inline (unsigned-byte 64) logcount")
+  (:policy :fast-safe)
   (:args (arg :scs (unsigned-reg) :target num))
   (:arg-types unsigned-num)
   (:results (res :scs (unsigned-reg)))
@@ -339,7 +353,7 @@
   (:temporary (:scs (non-descriptor-reg)) temp)
   (:translate *)
   (:generator 4
-    (inst sra y 2 temp)
+    (inst sra y n-fixnum-tag-bits temp)
     (inst mulq x temp r)))
 
 (define-vop (fast-*/signed=>signed fast-signed-binop)
@@ -581,43 +595,6 @@
       (emit-label done)
       (move res result))))
 
-(define-source-transform 32bit-logical-not (x)
-  `(logand (lognot (the (unsigned-byte 32) ,x)) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-and ((x y))
-  '(logand x y))
-
-(define-source-transform 32bit-logical-nand (x y)
-  `(32bit-logical-not (32bit-logical-and ,x ,y)))
-
-(deftransform 32bit-logical-or ((x y))
-  '(logior x y))
-
-(define-source-transform 32bit-logical-nor (x y)
-  `(logand (lognor (the (unsigned-byte 32) ,x) (the (unsigned-byte 32) ,y))
-           #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-xor ((x y))
-  '(logxor x y))
-
-(define-source-transform 32bit-logical-eqv (x y)
-  `(logand (logeqv (the (unsigned-byte 32) ,x) (the (unsigned-byte 32) ,y))
-	   #.(1- (ash 1 32))))
-
-(define-source-transform 32bit-logical-orc1 (x y)
-  `(logand (logorc1 (the (unsigned-byte 32) ,x) (the (unsigned-byte 32) ,y))
-	   #.(1- (ash 1 32))))
-
-(define-source-transform 32bit-logical-orc2 (x y)
-  `(logand (logorc2 (the (unsigned-byte 32) ,x) (the (unsigned-byte 32) ,y))
-	   #.(1- (ash 1 32))))
-
-(define-source-transform 32bit-logical-andc1 (x y)
-  `(logandc1 (the (unsigned-byte 32) ,x) (the (unsigned-byte 32) ,y)))
-
-(define-source-transform 32bit-logical-andc2 (x y)
-  `(logandc2 (the (unsigned-byte 32) ,x) (the (unsigned-byte 32) ,y)))
-
 (define-vop (shift-towards-someplace)
   (:policy :fast-safe)
   (:args (num :scs (unsigned-reg))
@@ -774,7 +751,7 @@
   (:results (digit :scs (unsigned-reg)))
   (:result-types unsigned-num)
   (:generator 1
-    (inst sra fixnum 2 digit)))
+    (inst sra fixnum n-fixnum-tag-bits digit)))
 
 (define-vop (bignum-floor)
   (:translate sb!bignum:%floor)