-;;;; 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
(:note "inline (signed-byte 64) arithmetic"))
(define-vop (fast-fixnum-binop-c fast-safe-arith-op)
- (:args (x :target r :scs (any-reg control-stack)))
+ (:args (x :target r :scs (any-reg)
+ :load-if (or (not (typep y '(signed-byte 29)))
+ (not (sc-is x any-reg control-stack)))))
(:info y)
- (:arg-types tagged-num (:constant (signed-byte 29)))
+ (:arg-types tagged-num (:constant fixnum))
(:results (r :scs (any-reg)
- :load-if (not (location= x r))))
+ :load-if (or (not (location= x r))
+ (not (typep y '(signed-byte 29))))))
(:result-types tagged-num)
(:note "inline fixnum arithmetic"))
-;; 31 not 64 because it's hard work loading 64 bit constants, and since
-;; sign-extension of immediates causes problems with 32.
(define-vop (fast-unsigned-binop-c fast-safe-arith-op)
- (:args (x :target r :scs (unsigned-reg unsigned-stack)))
+ (:args (x :target r :scs (unsigned-reg)
+ :load-if (or (not (typep y '(unsigned-byte 31)))
+ (not (sc-is x unsigned-reg unsigned-stack)))))
(:info y)
- (:arg-types unsigned-num (:constant (unsigned-byte 31)))
+ (:arg-types unsigned-num (:constant (unsigned-byte 64)))
(:results (r :scs (unsigned-reg)
- :load-if (not (location= x r))))
+ :load-if (or (not (location= x r))
+ (not (typep y '(unsigned-byte 31))))))
(:result-types unsigned-num)
(:note "inline (unsigned-byte 64) arithmetic"))
(define-vop (fast-signed-binop-c fast-safe-arith-op)
- (:args (x :target r :scs (signed-reg signed-stack)))
+ (:args (x :target r :scs (signed-reg)
+ :load-if (or (not (typep y '(signed-byte 32)))
+ (not (sc-is x signed-reg signed-stack)))))
(:info y)
- (:arg-types signed-num (:constant (signed-byte 32)))
+ (:arg-types signed-num (:constant (signed-byte 64)))
(:results (r :scs (signed-reg)
- :load-if (not (location= x r))))
+ :load-if (or (not (location= x r))
+ (not (typep y '(signed-byte 32))))))
(:result-types signed-num)
(:note "inline (signed-byte 64) arithmetic"))
(:translate ,translate)
(:generator 1
(move r x)
- (inst ,op r (fixnumize y))))
+ (inst ,op r (if (typep y '(signed-byte 29))
+ (fixnumize y)
+ (register-inline-constant :qword (fixnumize y))))))
(define-vop (,(symbolicate "FAST-" translate "/SIGNED=>SIGNED")
fast-signed-binop)
(:translate ,translate)
(:translate ,translate)
(:generator ,untagged-penalty
(move r x)
- (inst ,op r y)))
+ (inst ,op r (if (typep y '(signed-byte 32))
+ y
+ (register-inline-constant :qword y)))))
(define-vop (,(symbolicate "FAST-"
translate
"/UNSIGNED=>UNSIGNED")
(:translate ,translate)
(:generator ,untagged-penalty
(move r x)
- (inst ,op r y))))))
+ (inst ,op r (if (typep y '(unsigned-byte 31))
+ y
+ (register-inline-constant :qword y))))))))
;;(define-binop + 4 add)
(define-binop - 4 sub)
(define-vop (fast-+-c/fixnum=>fixnum fast-safe-arith-op)
(:translate +)
- (:args (x :target r :scs (any-reg control-stack)))
+ (:args (x :target r :scs (any-reg)
+ :load-if (or (not (typep y '(signed-byte 29)))
+ (not (sc-is x any-reg control-stack)))))
(:info y)
- (:arg-types tagged-num (:constant (signed-byte 29)))
+ (:arg-types tagged-num (:constant fixnum))
(:results (r :scs (any-reg)
- :load-if (not (location= x r))))
+ :load-if (or (not (location= x r))
+ (not (typep y '(signed-byte 29))))))
(:result-types tagged-num)
(:note "inline fixnum arithmetic")
(:generator 1
- (cond ((and (sc-is x any-reg) (sc-is r any-reg) (not (location= x r)))
+ (cond ((and (sc-is x any-reg) (sc-is r any-reg) (not (location= x r))
+ (typep y '(signed-byte 29)))
(inst lea r (make-ea :qword :base x :disp (fixnumize y))))
+ ((typep y '(signed-byte 29))
+ (move r x)
+ (inst add r (fixnumize y)))
(t
(move r x)
- (inst add r (fixnumize y))))))
+ (inst add r (register-inline-constant :qword (fixnumize y)))))))
(define-vop (fast-+/signed=>signed fast-safe-arith-op)
(:translate +)
(define-vop (fast-logand-c/signed-unsigned=>unsigned
fast-logand-c/unsigned=>unsigned)
- (:args (x :target r :scs (signed-reg signed-stack)))
- (:arg-types signed-num (:constant (unsigned-byte 31))))
+ (:args (x :target r :scs (signed-reg)
+ :load-if (or (not (typep y '(unsigned-byte 31)))
+ (not (sc-is r signed-reg signed-stack)))))
+ (:arg-types signed-num (:constant (unsigned-byte 64))))
(define-vop (fast-logand/unsigned-signed=>unsigned
fast-logand/unsigned=>unsigned)
(define-vop (fast-+-c/signed=>signed fast-safe-arith-op)
(:translate +)
- (:args (x :target r :scs (signed-reg signed-stack)))
+ (:args (x :target r :scs (signed-reg)
+ :load-if (or (not (typep y '(signed-byte 32)))
+ (not (sc-is r signed-reg signed-stack)))))
(:info y)
- (:arg-types signed-num (:constant (signed-byte 32)))
+ (:arg-types signed-num (:constant (signed-byte 64)))
(:results (r :scs (signed-reg)
- :load-if (not (location= x r))))
+ :load-if (or (not (location= x r))
+ (not (typep y '(signed-byte 32))))))
(:result-types signed-num)
(:note "inline (signed-byte 64) arithmetic")
(:generator 4
(cond ((and (sc-is x signed-reg) (sc-is r signed-reg)
- (not (location= x r)))
+ (not (location= x r))
+ (typep y '(signed-byte 32)))
(inst lea r (make-ea :qword :base x :disp y)))
(t
(move r x)
- (if (= y 1)
- (inst inc r)
- (inst add r y))))))
+ (cond ((= y 1)
+ (inst inc r))
+ ((typep y '(signed-byte 32))
+ (inst add r y))
+ (t
+ (inst add r (register-inline-constant :qword y))))))))
(define-vop (fast-+/unsigned=>unsigned fast-safe-arith-op)
(:translate +)
(define-vop (fast-+-c/unsigned=>unsigned fast-safe-arith-op)
(:translate +)
- (:args (x :target r :scs (unsigned-reg unsigned-stack)))
+ (:args (x :target r :scs (unsigned-reg)
+ :load-if (or (not (typep y '(unsigned-byte 31)))
+ (not (sc-is x unsigned-reg unsigned-stack)))))
(:info y)
- (:arg-types unsigned-num (:constant (unsigned-byte 31)))
+ (:arg-types unsigned-num (:constant (unsigned-byte 64)))
(:results (r :scs (unsigned-reg)
- :load-if (not (location= x r))))
+ :load-if (or (not (location= x r))
+ (not (typep y '(unsigned-byte 31))))))
(:result-types unsigned-num)
(:note "inline (unsigned-byte 64) arithmetic")
(:generator 4
(cond ((and (sc-is x unsigned-reg) (sc-is r unsigned-reg)
- (not (location= x r)))
+ (not (location= x r))
+ (typep y '(unsigned-byte 31)))
(inst lea r (make-ea :qword :base x :disp y)))
(t
(move r x)
- (if (= y 1)
- (inst inc r)
- (inst add r y))))))
+ (cond ((= y 1)
+ (inst inc r))
+ ((typep y '(unsigned-byte 31))
+ (inst add r y))
+ (t
+ (inst add r (register-inline-constant :qword y))))))))
\f
;;;; multiplication and division
(define-vop (fast-*-c/fixnum=>fixnum fast-safe-arith-op)
(:translate *)
;; We need different loading characteristics.
- (:args (x :scs (any-reg control-stack)))
+ (:args (x :scs (any-reg)
+ :load-if (or (not (typep y '(signed-byte 32)))
+ (not (sc-is x any-reg control-stack)))))
(:info y)
- (:arg-types tagged-num (:constant (signed-byte 29)))
+ (:arg-types tagged-num (:constant fixnum))
(:results (r :scs (any-reg)))
(:result-types tagged-num)
(:note "inline fixnum arithmetic")
(:generator 3
- (inst imul r x y)))
+ (cond ((typep y '(signed-byte 32))
+ (inst imul r x y))
+ (t
+ (move r x)
+ (inst imul r (register-inline-constant :qword y))))))
(define-vop (fast-*/signed=>signed fast-safe-arith-op)
(:translate *)
(define-vop (fast-*-c/signed=>signed fast-safe-arith-op)
(:translate *)
;; We need different loading characteristics.
- (:args (x :scs (signed-reg signed-stack)))
+ (:args (x :scs (signed-reg)
+ :load-if (or (not (typep y '(signed-byte 32)))
+ (not (sc-is x signed-reg signed-stack)))))
(:info y)
- (:arg-types signed-num (:constant (signed-byte 32)))
+ (:arg-types signed-num (:constant (signed-byte 64)))
(:results (r :scs (signed-reg)))
(:result-types signed-num)
(:note "inline (signed-byte 64) arithmetic")
(:generator 4
- (inst imul r x y)))
+ (cond ((typep y '(signed-byte 32))
+ (inst imul r x y))
+ (t
+ (move r x)
+ (inst imul r (register-inline-constant :qword y))))))
(define-vop (fast-*/unsigned=>unsigned fast-safe-arith-op)
(:translate *)
(: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-*-c/unsigned=>unsigned fast-safe-arith-op)
+ (:translate *)
+ (:args (x :scs (unsigned-reg) :target eax))
+ (:info y)
+ (:arg-types unsigned-num (:constant (unsigned-byte 64)))
+ (: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 (r :scs (unsigned-reg)))
+ (:result-types unsigned-num)
+ (:note "inline (unsigned-byte 64) arithmetic")
+ (:vop-var vop)
+ (:save-p :compute-only)
+ (:generator 6
+ (move eax x)
+ (inst mul eax (register-inline-constant :qword y))
+ (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))
(inst cqo)
(inst idiv eax y)
(if (location= quo eax)
- (inst shl eax 3)
- (inst lea quo (make-ea :qword :index eax :scale 8)))
+ (inst shl eax n-fixnum-tag-bits)
+ (inst lea quo (make-ea :qword :index eax
+ :scale (ash 1 n-fixnum-tag-bits))))
(move rem edx)))
(define-vop (fast-truncate-c/fixnum=>fixnum fast-safe-arith-op)
(:translate truncate)
(:args (x :scs (any-reg) :target eax))
(:info y)
- (:arg-types tagged-num (:constant (signed-byte 29)))
+ (:arg-types tagged-num (:constant fixnum))
(:temporary (:sc signed-reg :offset eax-offset :target quo
:from :argument :to (:result 0)) eax)
(:temporary (:sc any-reg :offset edx-offset :target rem
(:generator 30
(move eax x)
(inst cqo)
- (inst mov y-arg (fixnumize y))
+ (if (typep y '(signed-byte 29))
+ (inst mov y-arg (fixnumize y))
+ (setf y-arg (register-inline-constant :qword (fixnumize y))))
(inst idiv eax y-arg)
(if (location= quo eax)
- (inst shl eax 3)
- (inst lea quo (make-ea :qword :index eax :scale 8)))
+ (inst shl eax n-fixnum-tag-bits)
+ (inst lea quo (make-ea :qword :index eax
+ :scale (ash 1 n-fixnum-tag-bits))))
(move rem edx)))
(define-vop (fast-truncate/unsigned=>unsigned fast-safe-arith-op)
(: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))
(:translate truncate)
(:args (x :scs (unsigned-reg) :target eax))
(:info y)
- (:arg-types unsigned-num (:constant (unsigned-byte 31)))
+ (:arg-types unsigned-num (:constant (unsigned-byte 64)))
(:temporary (:sc unsigned-reg :offset eax-offset :target quo
:from :argument :to (:result 0)) eax)
(:temporary (:sc unsigned-reg :offset edx-offset :target rem
(:generator 32
(move eax x)
(inst xor edx edx)
- (inst mov y-arg y)
+ (if (typep y '(unsigned-byte 31))
+ (inst mov y-arg y)
+ (setf y-arg (register-inline-constant :qword y)))
(inst div eax y-arg)
(move quo eax)
(move rem edx)))
(: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))
(:translate truncate)
(:args (x :scs (signed-reg) :target eax))
(:info y)
- (:arg-types signed-num (:constant (signed-byte 32)))
+ (:arg-types signed-num (:constant (signed-byte 64)))
(:temporary (:sc signed-reg :offset eax-offset :target quo
:from :argument :to (:result 0)) eax)
(:temporary (:sc signed-reg :offset edx-offset :target rem
(:generator 32
(move eax x)
(inst cqo)
- (inst mov y-arg y)
+ (if (typep y '(signed-byte 32))
+ (inst mov y-arg y)
+ (setf y-arg (register-inline-constant :qword y)))
(inst idiv eax y-arg)
(move quo eax)
(move rem edx)))
(location= number result)))))
(:result-types tagged-num)
(:note "inline ASH")
+ (:variant nil)
+ (:variant-vars modularp)
(: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)
+ (unless modularp
+ (aver (not "Impossible: fixnum ASH should not be called with
+constant shift greater than word length")))
+ (if (sc-is result any-reg)
+ (zeroize 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)
;;;; binary conditional VOPs
(define-vop (fast-conditional)
- (:conditional)
- (:info target not-p)
+ (:conditional :e)
+ (:info)
(:effects)
(:affected)
(:policy :fast-safe))
(:note "inline fixnum comparison"))
(define-vop (fast-conditional-c/fixnum fast-conditional/fixnum)
- (:args (x :scs (any-reg control-stack)))
- (:arg-types tagged-num (:constant (signed-byte 29)))
- (:info target not-p y))
+ (:args (x :scs (any-reg)
+ :load-if (or (not (typep y '(signed-byte 29)))
+ (not (sc-is x any-reg control-stack)))))
+ (:arg-types tagged-num (:constant fixnum))
+ (:info y))
(define-vop (fast-conditional/signed fast-conditional)
(:args (x :scs (signed-reg)
(:note "inline (signed-byte 64) comparison"))
(define-vop (fast-conditional-c/signed fast-conditional/signed)
- (:args (x :scs (signed-reg signed-stack)))
- (:arg-types signed-num (:constant (signed-byte 31)))
- (:info target not-p y))
+ (:args (x :scs (signed-reg)
+ :load-if (or (not (typep y '(signed-byte 32)))
+ (not (sc-is x signed-reg signed-stack)))))
+ (:arg-types signed-num (:constant (signed-byte 64)))
+ (:info y))
(define-vop (fast-conditional/unsigned fast-conditional)
(:args (x :scs (unsigned-reg)
(:note "inline (unsigned-byte 64) comparison"))
(define-vop (fast-conditional-c/unsigned fast-conditional/unsigned)
- (:args (x :scs (unsigned-reg unsigned-stack)))
- (:arg-types unsigned-num (:constant (unsigned-byte 31)))
- (:info target not-p y))
+ (:args (x :scs (unsigned-reg)
+ :load-if (or (not (typep y '(unsigned-byte 31)))
+ (not (sc-is x unsigned-reg unsigned-stack)))))
+ (:arg-types unsigned-num (:constant (unsigned-byte 64)))
+ (:info y))
(macrolet ((define-conditional-vop (tran cond unsigned not-cond not-unsigned)
`(progn
(format nil "~:@(FAST-CONDITIONAL~A~)"
suffix)))
(:translate ,tran)
+ (:conditional ,(if signed cond unsigned))
(:generator ,cost
(inst cmp x
- ,(if (eq suffix '-c/fixnum)
- '(fixnumize y)
- 'y))
- (inst jmp (if not-p
- ,(if signed
- not-cond
- not-unsigned)
- ,(if signed
- cond
- unsigned))
- target))))
+ ,(case suffix
+ (-c/fixnum
+ `(if (typep y '(signed-byte 29))
+ (fixnumize y)
+ (register-inline-constant
+ :qword (fixnumize y))))
+ (-c/signed
+ `(if (typep y '(signed-byte 32))
+ y
+ (register-inline-constant
+ :qword y)))
+ (-c/unsigned
+ `(if (typep y '(unsigned-byte 31))
+ y
+ (register-inline-constant
+ :qword y)))
+ (t 'y))))))
'(/fixnum -c/fixnum /signed -c/signed /unsigned -c/unsigned)
; '(/fixnum /signed /unsigned)
'(4 3 6 5 6 5)
(define-vop (fast-if-eql/signed fast-conditional/signed)
(:translate eql)
(:generator 6
- (inst cmp x y)
- (inst jmp (if not-p :ne :e) target)))
+ (inst cmp x y)))
(define-vop (fast-if-eql-c/signed fast-conditional-c/signed)
(:translate eql)
(:generator 5
(cond ((and (sc-is x signed-reg) (zerop y))
(inst test x x)) ; smaller instruction
+ ((typep y '(signed-byte 32))
+ (inst cmp x y))
(t
- (inst cmp x y)))
- (inst jmp (if not-p :ne :e) target)))
+ (inst cmp x (register-inline-constant :qword y))))))
(define-vop (fast-if-eql/unsigned fast-conditional/unsigned)
(:translate eql)
(:generator 6
- (inst cmp x y)
- (inst jmp (if not-p :ne :e) target)))
+ (inst cmp x y)))
(define-vop (fast-if-eql-c/unsigned fast-conditional-c/unsigned)
(:translate eql)
(:generator 5
(cond ((and (sc-is x unsigned-reg) (zerop y))
(inst test x x)) ; smaller instruction
+ ((typep y '(unsigned-byte 31))
+ (inst cmp x y))
(t
- (inst cmp x y)))
- (inst jmp (if not-p :ne :e) target)))
+ (inst cmp x (register-inline-constant :qword y))))))
;;; EQL/FIXNUM is funny because the first arg can be of any type, not just a
;;; known fixnum.
(:note "inline fixnum comparison")
(:translate eql)
(:generator 4
- (inst cmp x y)
- (inst jmp (if not-p :ne :e) target)))
+ (inst cmp x y)))
+
(define-vop (generic-eql/fixnum fast-eql/fixnum)
(:args (x :scs (any-reg descriptor-reg)
:load-if (not (and (sc-is x control-stack)
(:arg-types * tagged-num)
(:variant-cost 7))
-
(define-vop (fast-eql-c/fixnum fast-conditional/fixnum)
- (:args (x :scs (any-reg control-stack)))
- (:arg-types tagged-num (:constant (signed-byte 29)))
- (:info target not-p y)
+ (:args (x :scs (any-reg)
+ :load-if (or (not (typep y '(signed-byte 29)))
+ (not (sc-is x any-reg descriptor-reg control-stack)))))
+ (:arg-types tagged-num (:constant fixnum))
+ (:info y)
(:translate eql)
(:generator 2
- (cond ((and (sc-is x any-reg) (zerop y))
+ (cond ((and (sc-is x any-reg descriptor-reg) (zerop y))
(inst test x x)) ; smaller instruction
+ ((typep y '(signed-byte 29))
+ (inst cmp x (fixnumize y)))
(t
- (inst cmp x (fixnumize y))))
- (inst jmp (if not-p :ne :e) target)))
+ (inst cmp x (register-inline-constant :qword (fixnumize y)))))))
(define-vop (generic-eql-c/fixnum fast-eql-c/fixnum)
- (:args (x :scs (any-reg descriptor-reg control-stack)))
- (:arg-types * (:constant (signed-byte 29)))
+ (:args (x :scs (any-reg descriptor-reg)))
+ (:arg-types * (:constant fixnum))
(:variant-cost 6))
\f
;;;; 32-bit logical operations
-(define-vop (merge-bits)
- (:translate merge-bits)
- (:args (shift :scs (signed-reg unsigned-reg) :target ecx)
- (prev :scs (unsigned-reg) :target result)
- (next :scs (unsigned-reg)))
- (:arg-types tagged-num unsigned-num unsigned-num)
- (:temporary (:sc signed-reg :offset ecx-offset :from (:argument 0)) ecx)
- (:results (result :scs (unsigned-reg) :from (:argument 1)))
- (:result-types unsigned-num)
- (:policy :fast-safe)
- (:generator 4
- (move ecx shift)
- (move result prev)
- (inst shrd result next :cl)))
-
;;; Only the lower 6 bits of the shift amount are significant.
(define-vop (shift-towards-someplace)
(:policy :fast-safe)
\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)
+ (typep y '(signed-byte 32))))))
+ (:info y)
+ (:arg-types untagged-num (:constant (or (unsigned-byte 64) (signed-byte 64))))
+ (: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)
- ;; (no -C variant as x86 MUL instruction doesn't take an immediate)
- (def * nil))
+ (def * t))
(define-vop (fast-ash-left-mod64-c/unsigned=>unsigned
fast-ash-c/unsigned=>unsigned)
(define-vop (fast-ash-left-smod61-c/fixnum=>fixnum
fast-ash-c/fixnum=>fixnum)
+ (:variant :modular)
(:translate ash-left-smod61))
(define-vop (fast-ash-left-smod61/fixnum=>fixnum
fast-ash-left/fixnum=>fixnum))
(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)
(:policy :fast-safe)
(:args (digit :scs (unsigned-reg)))
(:arg-types unsigned-num)
- (:conditional)
- (:info target not-p)
+ (:conditional :ns)
(:generator 3
- (inst or digit digit)
- (inst jmp (if not-p :s :ns) target)))
+ (inst or digit digit)))
;;; For add and sub with carry the sc of carry argument is any-reg so
(inst sar digit 3)))
(define-vop (bignum-floor)
- (:translate sb!bignum:%floor)
+ (:translate sb!bignum:%bigfloor)
(:policy :fast-safe)
(:args (div-high :scs (unsigned-reg) :target edx)
(div-low :scs (unsigned-reg) :target eax)
projects / sbcl.git / blobdiff