0.8.17.29:

[sbcl.git] / src / compiler / ppc / arith.lisp

diff --git a/src/compiler/ppc/arith.lisp b/src/compiler/ppc/arith.lisp
index 5570dc5..28d4acb 100644 (file)
--- a/src/compiler/ppc/arith.lisp
+++ b/src/compiler/ppc/arith.lisp
@@ -239,7 +239,7 @@
   (:note "safe inline fixnum arithmetic")
   (:generator 4
     (let* ((no-overflow (gen-label)))
-      (inst mcrxr :cr0)
+      (inst mtxer zero-tn)
       (inst addo. r x y)
       (inst bns no-overflow)
       (inst unimp (logior (ash (reg-tn-encoding r) 5)
@@ -254,7 +254,7 @@
   (:note "safe inline fixnum arithmetic")
   (:generator 4
     (let* ((no-overflow (gen-label)))
-      (inst mcrxr :cr0)
+      (inst mtxer zero-tn)
       (inst subo. r x y)
       (inst bns no-overflow)
       (inst unimp (logior (ash (reg-tn-encoding r) 5)
@@ -371,6 +371,8 @@
     (cond
       ((and (minusp amount) (< amount -31)) (move result zero-tn))
       ((minusp amount) (inst srwi result number (- amount)))
+      ;; possible because this is used in the modular version too
+      ((> amount 31) (move result zero-tn))
       (t (inst slwi result number amount)))))
 
 (define-vop (fast-ash/signed=>signed)
@@ -458,7 +460,7 @@
 
 \f
 ;;;; Modular functions:
-(define-modular-fun lognot-mod32 (x) lognot 32)
+(define-modular-fun lognot-mod32 (x) lognot :unsigned 32)
 (define-vop (lognot-mod32/unsigned=>unsigned)
   (:translate lognot-mod32)
   (:args (x :scs (unsigned-reg)))
@@ -473,6 +475,14 @@
             fast-ash-c/unsigned=>unsigned)
   (:translate ash-left-mod32))
 
+(define-vop (fast-ash-left-mod32/unsigned=>unsigned
+             fast-ash-left/unsigned=>unsigned))
+(deftransform ash-left-mod32 ((integer count)
+                             ((unsigned-byte 32) (unsigned-byte 5)))
+  (when (sb!c::constant-lvar-p count)
+    (sb!c::give-up-ir1-transform))
+  '(%primitive fast-ash-left-mod32/unsigned=>unsigned integer count))
+
 (macrolet 
     ((define-modular-backend (fun &optional constantp)
        (let ((mfun-name (symbolicate fun '-mod32))
@@ -481,7 +491,7 @@
             (vop (symbolicate 'fast- fun '/unsigned=>unsigned))
             (cvop (symbolicate 'fast- fun '-c/unsigned=>unsigned)))
         `(progn
-           (define-modular-fun ,mfun-name (x y) ,fun 32)
+           (define-modular-fun ,mfun-name (x y) ,fun :unsigned 32)
            (define-vop (,modvop ,vop)
              (:translate ,mfun-name))
            ,@(when constantp
@@ -489,6 +499,7 @@
                    (:translate ,mfun-name))))))))
   (define-modular-backend + t)
   (define-modular-backend - t)
+  (define-modular-backend * t)
   (define-modular-backend logxor t)
   (define-modular-backend logeqv)
   (define-modular-backend lognand)
@@ -700,39 +711,6 @@
       (emit-label done)
       (move result res))))
 
-(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))
-
-(deftransform 32bit-logical-nand ((x y))
-  '(logand (lognand x y) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-or ((x y))
-  '(logior x y))
-
-(deftransform 32bit-logical-nor ((x y))
-  '(logand (lognor x y) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-xor ((x y))
-  '(logxor x y))
-
-(deftransform 32bit-logical-eqv ((x y))
-  '(logand (logeqv x y) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-orc1 ((x y))
-  '(logand (logorc1 x y) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-orc2 ((x y))
-  '(logand (logorc2 x y) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-andc1 ((x y))
-  '(logand (logandc1 x y) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-andc2 ((x y))
-  '(logand (logandc2 x y) #.(1- (ash 1 32))))
-
 (define-vop (shift-towards-someplace)
   (:policy :fast-safe)
   (:args (num :scs (unsigned-reg))
@@ -758,22 +736,22 @@
 ;;;; Bignum stuff.
 
 (define-vop (bignum-length get-header-data)
-  (:translate sb!bignum::%bignum-length)
+  (:translate sb!bignum:%bignum-length)
   (:policy :fast-safe))
 
 (define-vop (bignum-set-length set-header-data)
-  (:translate sb!bignum::%bignum-set-length)
+  (:translate sb!bignum:%bignum-set-length)
   (:policy :fast-safe))
 
 (define-vop (bignum-ref word-index-ref)
-  (:variant sb!vm:bignum-digits-offset sb!vm:other-pointer-lowtag)
-  (:translate sb!bignum::%bignum-ref)
+  (:variant bignum-digits-offset other-pointer-lowtag)
+  (:translate sb!bignum:%bignum-ref)
   (:results (value :scs (unsigned-reg)))
   (:result-types unsigned-num))
 
 (define-vop (bignum-set word-index-set)
-  (:variant sb!vm:bignum-digits-offset sb!vm:other-pointer-lowtag)
-  (:translate sb!bignum::%bignum-set)
+  (:variant bignum-digits-offset other-pointer-lowtag)
+  (:translate sb!bignum:%bignum-set)
   (:args (object :scs (descriptor-reg))
         (index :scs (any-reg immediate zero))
         (value :scs (unsigned-reg)))
@@ -782,7 +760,7 @@
   (:result-types unsigned-num))
 
 (define-vop (digit-0-or-plus)
-  (:translate sb!bignum::%digit-0-or-plusp)
+  (:translate sb!bignum:%digit-0-or-plusp)
   (:policy :fast-safe)
   (:args (digit :scs (unsigned-reg)))
   (:arg-types unsigned-num)
@@ -796,7 +774,7 @@
       (emit-label done))))
 
 (define-vop (add-w/carry)
-  (:translate sb!bignum::%add-with-carry)
+  (:translate sb!bignum:%add-with-carry)
   (:policy :fast-safe)
   (:args (a :scs (unsigned-reg))
         (b :scs (unsigned-reg))
@@ -812,7 +790,7 @@
     (inst addze carry zero-tn)))
 
 (define-vop (sub-w/borrow)
-  (:translate sb!bignum::%subtract-with-borrow)
+  (:translate sb!bignum:%subtract-with-borrow)
   (:policy :fast-safe)
   (:args (a :scs (unsigned-reg))
         (b :scs (unsigned-reg))
@@ -828,7 +806,7 @@
     (inst addze borrow zero-tn)))
 
 (define-vop (bignum-mult-and-add-3-arg)
-  (:translate sb!bignum::%multiply-and-add)
+  (:translate sb!bignum:%multiply-and-add)
   (:policy :fast-safe)
   (:args (x :scs (unsigned-reg))
         (y :scs (unsigned-reg))
@@ -847,7 +825,7 @@
     (inst addze hi hi-temp)))
 
 (define-vop (bignum-mult-and-add-4-arg)
-  (:translate sb!bignum::%multiply-and-add)
+  (:translate sb!bignum:%multiply-and-add)
   (:policy :fast-safe)
   (:args (x :scs (unsigned-reg))
         (y :scs (unsigned-reg))
@@ -869,7 +847,7 @@
     (inst addze hi hi-temp)))
 
 (define-vop (bignum-mult)
-  (:translate sb!bignum::%multiply)
+  (:translate sb!bignum:%multiply)
   (:policy :fast-safe)
   (:args (x :scs (unsigned-reg) :to (:eval 1))
         (y :scs (unsigned-reg) :to (:eval 1)))
@@ -882,10 +860,10 @@
     (inst mulhwu hi x y)))
 
 (define-vop (bignum-lognot lognot-mod32/unsigned=>unsigned)
-  (:translate sb!bignum::%lognot))
+  (:translate sb!bignum:%lognot))
 
 (define-vop (fixnum-to-digit)
-  (:translate sb!bignum::%fixnum-to-digit)
+  (:translate sb!bignum:%fixnum-to-digit)
   (:policy :fast-safe)
   (:args (fixnum :scs (any-reg)))
   (:arg-types tagged-num)
@@ -896,7 +874,7 @@
 
 
 (define-vop (bignum-floor)
-  (:translate sb!bignum::%floor)
+  (:translate sb!bignum:%floor)
   (:policy :fast-safe)
   (:args (num-high :scs (unsigned-reg) :target rem)
         (num-low :scs (unsigned-reg) :target rem-low)
@@ -934,7 +912,7 @@
 #|
 
 (define-vop (bignum-floor)
-  (:translate sb!bignum::%floor)
+  (:translate sb!bignum:%floor)
   (:policy :fast-safe)
   (:args (div-high :scs (unsigned-reg) :target rem)
         (div-low :scs (unsigned-reg) :target quo)
@@ -950,7 +928,7 @@
 |#
 
 (define-vop (signify-digit)
-  (:translate sb!bignum::%fixnum-digit-with-correct-sign)
+  (:translate sb!bignum:%fixnum-digit-with-correct-sign)
   (:policy :fast-safe)
   (:args (digit :scs (unsigned-reg) :target res))
   (:arg-types unsigned-num)
@@ -965,7 +943,7 @@
 
 
 (define-vop (digit-ashr)
-  (:translate sb!bignum::%ashr)
+  (:translate sb!bignum:%ashr)
   (:policy :fast-safe)
   (:args (digit :scs (unsigned-reg))
         (count :scs (unsigned-reg)))
@@ -976,12 +954,12 @@
     (inst sraw result digit count)))
 
 (define-vop (digit-lshr digit-ashr)
-  (:translate sb!bignum::%digit-logical-shift-right)
+  (:translate sb!bignum:%digit-logical-shift-right)
   (:generator 1
     (inst srw result digit count)))
 
 (define-vop (digit-ashl digit-ashr)
-  (:translate sb!bignum::%ashl)
+  (:translate sb!bignum:%ashl)
   (:generator 1
     (inst slw result digit count)))