-;;;; the VM definition of arithmetic VOPs for the x86
+;;;; the VM definition of arithmetic VOPs for the x86-64
;;;; This software is part of the SBCL system. See the README file for
;;;; more information.
(define-vop (fast-lognot/fixnum fixnum-unop)
(:translate lognot)
- (:generator 2
+ (:generator 1
(move res x)
(inst xor res (fixnumize -1))))
(define-vop (fast-lognot/signed signed-unop)
(:translate lognot)
- (:generator 1
+ (:generator 2
(move res x)
(inst not res)))
\f
(:args (x :scs (unsigned-reg) :target eax)
(y :scs (unsigned-reg unsigned-stack)))
(:arg-types unsigned-num unsigned-num)
- (:temporary (:sc unsigned-reg :offset eax-offset :target result
+ (:temporary (:sc unsigned-reg :offset eax-offset :target r
:from (:argument 0) :to :result) eax)
(:temporary (:sc unsigned-reg :offset edx-offset
:from :eval :to :result) edx)
(:ignore edx)
- (:results (result :scs (unsigned-reg)))
+ (:results (r :scs (unsigned-reg)))
(:result-types unsigned-num)
(:note "inline (unsigned-byte 64) arithmetic")
(:vop-var vop)
(:generator 6
(move eax x)
(inst mul eax y)
- (move result eax)))
+ (move r eax)))
(define-vop (fast-truncate/fixnum=>fixnum fast-safe-arith-op)
(:vop-var vop)
(:save-p :compute-only)
(:generator 31
- (let ((zero (generate-error-code vop division-by-zero-error x y)))
+ (let ((zero (generate-error-code vop 'division-by-zero-error x y)))
(if (sc-is y any-reg)
(inst test y y) ; smaller instruction
(inst cmp y 0))
(:vop-var vop)
(:save-p :compute-only)
(:generator 33
- (let ((zero (generate-error-code vop division-by-zero-error x y)))
+ (let ((zero (generate-error-code vop 'division-by-zero-error x y)))
(if (sc-is y unsigned-reg)
(inst test y y) ; smaller instruction
(inst cmp y 0))
(:vop-var vop)
(:save-p :compute-only)
(:generator 33
- (let ((zero (generate-error-code vop division-by-zero-error x y)))
+ (let ((zero (generate-error-code vop 'division-by-zero-error x y)))
(if (sc-is y signed-reg)
(inst test y y) ; smaller instruction
(inst cmp y 0))
(:note "inline ASH")
(:generator 2
(cond ((and (= amount 1) (not (location= number result)))
- (inst lea result (make-ea :qword :index number :scale 2)))
+ (inst lea result (make-ea :qword :base number :index number)))
((and (= amount 2) (not (location= number result)))
(inst lea result (make-ea :qword :index number :scale 4)))
((and (= amount 3) (not (location= number result)))
(inst lea result (make-ea :qword :index number :scale 8)))
(t
(move result number)
- (cond ((plusp amount)
- ;; We don't have to worry about overflow because of the
- ;; result type restriction.
- (inst shl result amount))
- (t
- ;; Since the shift instructions take the shift amount
- ;; modulo 64 we must special case amounts of 64 and more.
- ;; Because fixnums have only 61 bits, the result is 0 or
- ;; -1 for all amounts of 60 or more, so use this as the
- ;; limit instead.
- (inst sar result (min (- n-word-bits n-fixnum-tag-bits 1)
- (- amount)))
- (inst and result (lognot fixnum-tag-mask))))))))
+ (cond ((< -64 amount 64)
+ ;; this code is used both in ASH and ASH-SMOD61, so
+ ;; be careful
+ (if (plusp amount)
+ (inst shl result amount)
+ (progn
+ (inst sar result (- amount))
+ (inst and result (lognot fixnum-tag-mask)))))
+ ((plusp amount)
+ (if (sc-is result any-reg)
+ (inst xor result result)
+ (inst mov result 0)))
+ (t (inst sar result 63)
+ (inst and result (lognot fixnum-tag-mask))))))))
(define-vop (fast-ash-left/fixnum=>fixnum)
(:translate ash)
(:note "inline ASH")
(:generator 3
(cond ((and (= amount 1) (not (location= number result)))
- (inst lea result (make-ea :qword :index number :scale 2)))
+ (inst lea result (make-ea :qword :base number :index number)))
((and (= amount 2) (not (location= number result)))
(inst lea result (make-ea :qword :index number :scale 4)))
((and (= amount 3) (not (location= number result)))
(:note "inline ASH")
(:generator 3
(cond ((and (= amount 1) (not (location= number result)))
- (inst lea result (make-ea :qword :index number :scale 2)))
+ (inst lea result (make-ea :qword :base number :index number)))
((and (= amount 2) (not (location= number result)))
(inst lea result (make-ea :qword :index number :scale 4)))
((and (= amount 3) (not (location= number result)))
(inst shl result amount)
(inst shr result (- amount))))
(t (if (sc-is result unsigned-reg)
- (inst xor result result)
+ (zeroize result)
(inst mov result 0))))))))
(define-vop (fast-ash-left/signed=>signed)
(inst neg ecx)
(inst cmp ecx 63)
(inst jmp :be OKAY)
- (inst xor result result)
+ (zeroize result)
(inst jmp DONE)
OKAY
(inst shr result :cl)
(inst or ecx ecx)
(inst jmp :ns POSITIVE)
(inst neg ecx)
- (inst xor zero zero)
+ (zeroize zero)
(inst shr result :cl)
(inst cmp ecx 63)
(inst cmov :nbe result zero)
(:result-types unsigned-num)
(:generator 28
(move res arg)
- (inst cmp res 0)
+ (if (sc-is res unsigned-reg)
+ (inst test res res)
+ (inst cmp res 0))
(inst jmp :ge POS)
(inst not res)
POS
(inst inc res)
(inst jmp DONE)
ZERO
- (inst xor res res)
+ (zeroize res)
DONE))
(define-vop (unsigned-byte-64-len)
(inst inc res)
(inst jmp DONE)
ZERO
- (inst xor res res)
+ (zeroize res)
DONE))
(define-vop (unsigned-byte-64-count)
\f
;;;; Modular functions
+(defmacro define-mod-binop ((name prototype) function)
+ `(define-vop (,name ,prototype)
+ (:args (x :target r :scs (unsigned-reg signed-reg)
+ :load-if (not (and (or (sc-is x unsigned-stack)
+ (sc-is x signed-stack))
+ (or (sc-is y unsigned-reg)
+ (sc-is y signed-reg))
+ (or (sc-is r unsigned-stack)
+ (sc-is r signed-stack))
+ (location= x r))))
+ (y :scs (unsigned-reg signed-reg unsigned-stack signed-stack)))
+ (:arg-types untagged-num untagged-num)
+ (:results (r :scs (unsigned-reg signed-reg) :from (:argument 0)
+ :load-if (not (and (or (sc-is x unsigned-stack)
+ (sc-is x signed-stack))
+ (or (sc-is y unsigned-reg)
+ (sc-is y unsigned-reg))
+ (or (sc-is r unsigned-stack)
+ (sc-is r unsigned-stack))
+ (location= x r)))))
+ (:result-types unsigned-num)
+ (:translate ,function)))
+(defmacro define-mod-binop-c ((name prototype) function)
+ `(define-vop (,name ,prototype)
+ (:args (x :target r :scs (unsigned-reg signed-reg)
+ :load-if (not (and (or (sc-is x unsigned-stack)
+ (sc-is x signed-stack))
+ (or (sc-is r unsigned-stack)
+ (sc-is r signed-stack))
+ (location= x r)))))
+ (:info y)
+ (:arg-types untagged-num (:constant (or (unsigned-byte 31) (signed-byte 32))))
+ (:results (r :scs (unsigned-reg signed-reg) :from (:argument 0)
+ :load-if (not (and (or (sc-is x unsigned-stack)
+ (sc-is x signed-stack))
+ (or (sc-is r unsigned-stack)
+ (sc-is r unsigned-stack))
+ (location= x r)))))
+ (:result-types unsigned-num)
+ (:translate ,function)))
+
(macrolet ((def (name -c-p)
(let ((fun64 (intern (format nil "~S-MOD64" name)))
(vopu (intern (format nil "FAST-~S/UNSIGNED=>UNSIGNED" name)))
(vopcu (intern (format nil "FAST-~S-C/UNSIGNED=>UNSIGNED" name)))
(vopf (intern (format nil "FAST-~S/FIXNUM=>FIXNUM" name)))
(vopcf (intern (format nil "FAST-~S-C/FIXNUM=>FIXNUM" name)))
- (vop64u (intern (format nil "FAST-~S-MOD64/UNSIGNED=>UNSIGNED" name)))
+ (vop64u (intern (format nil "FAST-~S-MOD64/WORD=>UNSIGNED" name)))
(vop64f (intern (format nil "FAST-~S-MOD64/FIXNUM=>FIXNUM" name)))
- (vop64cu (intern (format nil "FAST-~S-MOD64-C/UNSIGNED=>UNSIGNED" name)))
+ (vop64cu (intern (format nil "FAST-~S-MOD64-C/WORD=>UNSIGNED" name)))
(vop64cf (intern (format nil "FAST-~S-MOD64-C/FIXNUM=>FIXNUM" name)))
(sfun61 (intern (format nil "~S-SMOD61" name)))
(svop61f (intern (format nil "FAST-~S-SMOD61/FIXNUM=>FIXNUM" name)))
(svop61cf (intern (format nil "FAST-~S-SMOD61-C/FIXNUM=>FIXNUM" name))))
`(progn
- (define-modular-fun ,fun64 (x y) ,name :unsigned 64)
- (define-modular-fun ,sfun61 (x y) ,name :signed 61)
- (define-vop (,vop64u ,vopu) (:translate ,fun64))
+ (define-modular-fun ,fun64 (x y) ,name :untagged nil 64)
+ (define-modular-fun ,sfun61 (x y) ,name :tagged t 61)
+ (define-mod-binop (,vop64u ,vopu) ,fun64)
(define-vop (,vop64f ,vopf) (:translate ,fun64))
(define-vop (,svop61f ,vopf) (:translate ,sfun61))
,@(when -c-p
- `((define-vop (,vop64cu ,vopcu) (:translate ,fun64))
+ `((define-mod-binop-c (,vop64cu ,vopcu) ,fun64)
(define-vop (,svop61cf ,vopcf) (:translate ,sfun61))))))))
(def + t)
(def - t)
(signed-byte 61)
(foldable flushable movable))
-(define-modular-fun-optimizer %lea ((base index scale disp) :unsigned :width width)
+(define-modular-fun-optimizer %lea ((base index scale disp) :untagged nil :width width)
(when (and (<= width 64)
(constant-lvar-p scale)
(constant-lvar-p disp))
- (cut-to-width base :unsigned width)
- (cut-to-width index :unsigned width)
+ (cut-to-width base :untagged width nil)
+ (cut-to-width index :untagged width nil)
'sb!vm::%lea-mod64))
-(define-modular-fun-optimizer %lea ((base index scale disp) :signed :width width)
+(define-modular-fun-optimizer %lea ((base index scale disp) :tagged t :width width)
(when (and (<= width 61)
(constant-lvar-p scale)
(constant-lvar-p disp))
- (cut-to-width base :signed width)
- (cut-to-width index :signed width)
+ (cut-to-width base :tagged width t)
+ (cut-to-width index :tagged width t)
'sb!vm::%lea-smod61))
#+sb-xc-host
(:translate %lea-smod61))
;;; logical operations
-(define-modular-fun lognot-mod64 (x) lognot :unsigned 64)
+(define-modular-fun lognot-mod64 (x) lognot :untagged nil 64)
(define-vop (lognot-mod64/unsigned=>unsigned)
(:translate lognot-mod64)
(:args (x :scs (unsigned-reg unsigned-stack) :target r
(move r x)
(inst not r)))
-(define-modular-fun logxor-mod64 (x y) logxor :unsigned 64)
-(define-vop (fast-logxor-mod64/unsigned=>unsigned
- fast-logxor/unsigned=>unsigned)
- (:translate logxor-mod64))
-(define-vop (fast-logxor-mod64-c/unsigned=>unsigned
- fast-logxor-c/unsigned=>unsigned)
- (:translate logxor-mod64))
-(define-vop (fast-logxor-mod64/fixnum=>fixnum
- fast-logxor/fixnum=>fixnum)
- (:translate logxor-mod64))
-(define-vop (fast-logxor-mod64-c/fixnum=>fixnum
- fast-logxor-c/fixnum=>fixnum)
- (:translate logxor-mod64))
-
(define-source-transform logeqv (&rest args)
(if (oddp (length args))
`(logxor ,@args)
(define-full-reffer bignum-ref * bignum-digits-offset other-pointer-lowtag
(unsigned-reg) unsigned-num sb!bignum:%bignum-ref)
-
+(define-full-reffer+offset bignum--ref-with-offset * bignum-digits-offset
+ other-pointer-lowtag (unsigned-reg) unsigned-num
+ sb!bignum:%bignum-ref-with-offset)
(define-full-setter bignum-set * bignum-digits-offset other-pointer-lowtag
(unsigned-reg) unsigned-num sb!bignum:%bignum-set)