projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.12.37:
[sbcl.git]
/
src
/
compiler
/
ppc
/
arith.lisp
diff --git
a/src/compiler/ppc/arith.lisp
b/src/compiler/ppc/arith.lisp
index
5570dc5
..
9004b6d
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)))
(: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)
(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)))
(: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)
(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)))
(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)
(t (inst slwi result number amount)))))
(define-vop (fast-ash/signed=>signed)
@@
-489,6
+491,7
@@
(:translate ,mfun-name))))))))
(define-modular-backend + t)
(define-modular-backend - t)
(: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)
(define-modular-backend logxor t)
(define-modular-backend logeqv)
(define-modular-backend lognand)
@@
-758,22
+761,22
@@
;;;; Bignum stuff.
(define-vop (bignum-length get-header-data)
;;;; 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)
(: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)
(: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)
(: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)))
(:args (object :scs (descriptor-reg))
(index :scs (any-reg immediate zero))
(value :scs (unsigned-reg)))
@@
-782,7
+785,7
@@
(:result-types unsigned-num))
(define-vop (digit-0-or-plus)
(: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)
(:policy :fast-safe)
(:args (digit :scs (unsigned-reg)))
(:arg-types unsigned-num)
@@
-796,7
+799,7
@@
(emit-label done))))
(define-vop (add-w/carry)
(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))
(:policy :fast-safe)
(:args (a :scs (unsigned-reg))
(b :scs (unsigned-reg))
@@
-812,7
+815,7
@@
(inst addze carry zero-tn)))
(define-vop (sub-w/borrow)
(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))
(:policy :fast-safe)
(:args (a :scs (unsigned-reg))
(b :scs (unsigned-reg))
@@
-828,7
+831,7
@@
(inst addze borrow zero-tn)))
(define-vop (bignum-mult-and-add-3-arg)
(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))
(:policy :fast-safe)
(:args (x :scs (unsigned-reg))
(y :scs (unsigned-reg))
@@
-847,7
+850,7
@@
(inst addze hi hi-temp)))
(define-vop (bignum-mult-and-add-4-arg)
(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))
(:policy :fast-safe)
(:args (x :scs (unsigned-reg))
(y :scs (unsigned-reg))
@@
-869,7
+872,7
@@
(inst addze hi hi-temp)))
(define-vop (bignum-mult)
(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)))
(:policy :fast-safe)
(:args (x :scs (unsigned-reg) :to (:eval 1))
(y :scs (unsigned-reg) :to (:eval 1)))
@@
-882,10
+885,10
@@
(inst mulhwu hi x y)))
(define-vop (bignum-lognot lognot-mod32/unsigned=>unsigned)
(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)
(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)
(:policy :fast-safe)
(:args (fixnum :scs (any-reg)))
(:arg-types tagged-num)
@@
-896,7
+899,7
@@
(define-vop (bignum-floor)
(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)
(:policy :fast-safe)
(:args (num-high :scs (unsigned-reg) :target rem)
(num-low :scs (unsigned-reg) :target rem-low)
@@
-934,7
+937,7
@@
#|
(define-vop (bignum-floor)
#|
(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)
(:policy :fast-safe)
(:args (div-high :scs (unsigned-reg) :target rem)
(div-low :scs (unsigned-reg) :target quo)
@@
-950,7
+953,7
@@
|#
(define-vop (signify-digit)
|#
(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)
(:policy :fast-safe)
(:args (digit :scs (unsigned-reg) :target res))
(:arg-types unsigned-num)
@@
-965,7
+968,7
@@
(define-vop (digit-ashr)
(define-vop (digit-ashr)
- (:translate sb!bignum::%ashr)
+ (:translate sb!bignum:%ashr)
(:policy :fast-safe)
(:args (digit :scs (unsigned-reg))
(count :scs (unsigned-reg)))
(:policy :fast-safe)
(:args (digit :scs (unsigned-reg))
(count :scs (unsigned-reg)))
@@
-976,12
+979,12
@@
(inst sraw result digit count)))
(define-vop (digit-lshr digit-ashr)
(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)
(: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)))
(:generator 1
(inst slw result digit count)))