(in-package "SB!VM")
\f
+
+;; A fixnum that can be represented in tagged form by a signed 32-bit
+;; value and that can therefore be used as an immediate argument of
+;; arithmetic machine instructions.
+(deftype short-tagged-num () '(signed-byte #.(- 32 n-fixnum-tag-bits)))
+
;;;; unary operations
(define-vop (fast-safe-arith-op)
(define-vop (fast-fixnum-binop-c fast-safe-arith-op)
(:args (x :target r :scs (any-reg)
- :load-if (or (not (typep y '(signed-byte 29)))
+ :load-if (or (not (typep y 'short-tagged-num))
(not (sc-is x any-reg control-stack)))))
(:info y)
(:arg-types tagged-num (:constant fixnum))
(:results (r :scs (any-reg)
:load-if (or (not (location= x r))
- (not (typep y '(signed-byte 29))))))
+ (not (typep y 'short-tagged-num)))))
(:result-types tagged-num)
(:note "inline fixnum arithmetic"))
(:translate ,translate)
(:generator 1
(move r x)
- (inst ,op r (if (typep y '(signed-byte 29))
+ (inst ,op r (if (typep y 'short-tagged-num)
(fixnumize y)
(register-inline-constant :qword (fixnumize y))))))
(define-vop (,(symbolicate "FAST-" translate "/SIGNED=>SIGNED")
(define-vop (fast-+-c/fixnum=>fixnum fast-safe-arith-op)
(:translate +)
(:args (x :target r :scs (any-reg)
- :load-if (or (not (typep y '(signed-byte 29)))
+ :load-if (or (not (typep y 'short-tagged-num))
(not (sc-is x any-reg control-stack)))))
(:info y)
(:arg-types tagged-num (:constant fixnum))
(:results (r :scs (any-reg)
:load-if (or (not (location= x r))
- (not (typep y '(signed-byte 29))))))
+ (not (typep y 'short-tagged-num)))))
(: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))
- (typep y '(signed-byte 29)))
+ (typep y 'short-tagged-num))
(inst lea r (make-ea :qword :base x :disp (fixnumize y))))
- ((typep y '(signed-byte 29))
+ ((typep y 'short-tagged-num)
(move r x)
(inst add r (fixnumize y)))
(t
(:note "inline fixnum arithmetic")
(:generator 4
(move r x)
- (inst sar r 3)
+ (inst sar r n-fixnum-tag-bits)
(inst imul r y)))
(define-vop (fast-*-c/fixnum=>fixnum fast-safe-arith-op)
(inst idiv eax y)
(if (location= quo eax)
(inst shl eax n-fixnum-tag-bits)
- (inst lea quo (make-ea :qword :index eax
- :scale (ash 1 n-fixnum-tag-bits))))
+ (if (= n-fixnum-tag-bits 1)
+ (inst lea quo (make-ea :qword :base eax :index eax))
+ (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)
(:generator 30
(move eax x)
(inst cqo)
- (if (typep y '(signed-byte 29))
+ (if (typep y 'short-tagged-num)
(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 n-fixnum-tag-bits)
- (inst lea quo (make-ea :qword :index eax
- :scale (ash 1 n-fixnum-tag-bits))))
+ (if (= n-fixnum-tag-bits 1)
+ (inst lea quo (make-ea :qword :base eax :index eax))
+ (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)
(t
(move result number)
(cond ((< -64 amount 64)
- ;; this code is used both in ASH and ASH-SMOD61, so
+ ;; this code is used both in ASH and ASH-MODFX, so
;; be careful
(if (plusp amount)
(inst shl result amount)
(progn
(inst sar result (- amount))
(inst and result (lognot fixnum-tag-mask)))))
+ ;; shifting left (zero fill)
((plusp amount)
(unless modularp
(aver (not "Impossible: fixnum ASH should not be called with
(if (sc-is result any-reg)
(zeroize result)
(inst mov result 0)))
+ ;; shifting right (sign fill)
(t (inst sar result 63)
(inst and result (lognot fixnum-tag-mask))))))))
(:generator 5
(move result number)
(move ecx amount)
- (inst or ecx ecx)
+ (inst test ecx ecx)
(inst jmp :ns POSITIVE)
(inst neg ecx)
(inst cmp ecx 63)
(:generator 5
(move result number)
(move ecx amount)
- (inst or ecx ecx)
+ (inst test ecx ecx)
(inst jmp :ns POSITIVE)
(inst neg ecx)
(inst cmp ecx 63)
(:generator 4
(move result number)
(move ecx amount)
- (inst or ecx ecx)
+ (inst test ecx ecx)
(inst jmp :ns POSITIVE)
(inst neg ecx)
(zeroize zero)
(:result-types unsigned-num)
(:generator 28
(move res arg)
- (if (sc-is res unsigned-reg)
- (inst test res res)
- (inst cmp res 0))
+ (inst test res res)
(inst jmp :ge POS)
(inst not res)
POS
(zeroize res)
DONE))
+;; INTEGER-LENGTH is implemented by using the BSR instruction, which
+;; returns the position of the first 1-bit from the right. And that needs
+;; to be incremented to get the width of the integer, and BSR doesn't
+;; work on 0, so it needs a branch to handle 0.
+
+;; But fixnums are tagged by being shifted left n-fixnum-tag-bits times,
+;; untagging by shifting right n-fixnum-tag-bits-1 times (and if
+;; n-fixnum-tag-bits = 1, no shifting is required), will make the
+;; resulting integer one bit wider, making the increment unnecessary.
+;; Then, to avoid calling BSR on 0, OR the result with 1. That sets the
+;; first bit to 1, and if all other bits are 0, BSR will return 0,
+;; which is the correct value for INTEGER-LENGTH.
+(define-vop (positive-fixnum-len)
+ (:translate integer-length)
+ (:note "inline positive fixnum integer-length")
+ (:policy :fast-safe)
+ (:args (arg :scs (any-reg)))
+ (:arg-types positive-fixnum)
+ (:results (res :scs (unsigned-reg)))
+ (:result-types unsigned-num)
+ (:generator 24
+ (move res arg)
+ (when (> n-fixnum-tag-bits 1)
+ (inst shr res (1- n-fixnum-tag-bits)))
+ (inst or res 1)
+ (inst bsr res res)))
+
+(define-vop (fixnum-len)
+ (:translate integer-length)
+ (:note "inline fixnum integer-length")
+ (:policy :fast-safe)
+ (:args (arg :scs (any-reg) :target res))
+ (:arg-types tagged-num)
+ (:results (res :scs (unsigned-reg)))
+ (:result-types unsigned-num)
+ (:generator 25
+ (move res arg)
+ (when (> n-fixnum-tag-bits 1)
+ (inst sar res (1- n-fixnum-tag-bits)))
+ (inst test res res)
+ (inst jmp :ge POS)
+ (inst not res)
+ POS
+ (inst or res 1)
+ (inst bsr res res)))
+\f
(define-vop (unsigned-byte-64-count)
(:translate logcount)
(:note "inline (unsigned-byte 64) logcount")
(define-vop (fast-conditional-c/fixnum fast-conditional/fixnum)
(:args (x :scs (any-reg)
- :load-if (or (not (typep y '(signed-byte 29)))
+ :load-if (or (not (typep y 'short-tagged-num))
(not (sc-is x any-reg control-stack)))))
(:arg-types tagged-num (:constant fixnum))
(:info y))
(:arg-types unsigned-num (:constant (unsigned-byte 64)))
(:info y))
+;; Stolen liberally from the x86 32-bit implementation.
+(macrolet ((define-logtest-vops ()
+ `(progn
+ ,@(loop for suffix in '(/fixnum -c/fixnum
+ /signed -c/signed
+ /unsigned -c/unsigned)
+ for cost in '(4 3 6 5 6 5)
+ collect
+ `(define-vop (,(symbolicate "FAST-LOGTEST" suffix)
+ ,(symbolicate "FAST-CONDITIONAL" suffix))
+ (:translate logtest)
+ (:conditional :ne)
+ (:generator ,cost
+ (emit-optimized-test-inst x
+ ,(if (eq suffix '-c/fixnum)
+ ;; See whether (fixnumize y) fits in signed 32
+ ;; to avoid chip's sign-extension of imm32 val.
+ `(if (typep y 'short-tagged-num)
+ (fixnumize y)
+ (register-inline-constant :qword (fixnumize y)))
+ `(cond ((typep y '(signed-byte 32)) ; same
+ y)
+ ((typep y '(or (unsigned-byte 64) (signed-byte 64)))
+ (register-inline-constant :qword y))
+ (t
+ y))))))))))
+ (define-logtest-vops))
+
+(defknown %logbitp (integer unsigned-byte) boolean
+ (movable foldable flushable always-translatable))
+
+;;; only for constant folding within the compiler
+(defun %logbitp (integer index)
+ (logbitp index integer))
+
+;;; too much work to do the non-constant case (maybe?)
+(define-vop (fast-logbitp-c/fixnum fast-conditional-c/fixnum)
+ (:translate %logbitp)
+ (:conditional :c)
+ (:arg-types tagged-num (:constant (integer 0 #.(- 63 n-fixnum-tag-bits))))
+ (:generator 4
+ (inst bt x (+ y n-fixnum-tag-bits))))
+
+(define-vop (fast-logbitp/signed fast-conditional/signed)
+ (:args (x :scs (signed-reg signed-stack))
+ (y :scs (signed-reg)))
+ (:translate %logbitp)
+ (:conditional :c)
+ (:generator 6
+ (inst bt x y)))
+
+(define-vop (fast-logbitp-c/signed fast-conditional-c/signed)
+ (:translate %logbitp)
+ (:conditional :c)
+ (:arg-types signed-num (:constant (integer 0 63)))
+ (:generator 5
+ (inst bt x y)))
+
+(define-vop (fast-logbitp/unsigned fast-conditional/unsigned)
+ (:args (x :scs (unsigned-reg unsigned-stack))
+ (y :scs (unsigned-reg)))
+ (:translate %logbitp)
+ (:conditional :c)
+ (:generator 6
+ (inst bt x y)))
+
+(define-vop (fast-logbitp-c/unsigned fast-conditional-c/unsigned)
+ (:translate %logbitp)
+ (:conditional :c)
+ (:arg-types unsigned-num (:constant (integer 0 63)))
+ (:generator 5
+ (inst bt x y)))
+
(macrolet ((define-conditional-vop (tran cond unsigned not-cond not-unsigned)
`(progn
,@(mapcar
(inst cmp x
,(case suffix
(-c/fixnum
- `(if (typep y '(signed-byte 29))
+ `(if (typep y 'short-tagged-num)
(fixnumize y)
(register-inline-constant
:qword (fixnumize y))))
(define-vop (fast-eql-c/fixnum fast-conditional/fixnum)
(:args (x :scs (any-reg)
- :load-if (or (not (typep y '(signed-byte 29)))
+ :load-if (or (not (typep y 'short-tagged-num))
(not (sc-is x any-reg descriptor-reg control-stack)))))
(:arg-types tagged-num (:constant fixnum))
(:info y)
(:generator 2
(cond ((and (sc-is x any-reg descriptor-reg) (zerop y))
(inst test x x)) ; smaller instruction
- ((typep y '(signed-byte 29))
+ ((typep y 'short-tagged-num)
(inst cmp x (fixnumize y)))
(t
(inst cmp x (register-inline-constant :qword (fixnumize y)))))))
(vop64f (intern (format nil "FAST-~S-MOD64/FIXNUM=>FIXNUM" 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))))
+ (funfx (intern (format nil "~S-MODFX" name)))
+ (vopfxf (intern (format nil "FAST-~S-MODFX/FIXNUM=>FIXNUM" name)))
+ (vopfxcf (intern (format nil "FAST-~S-MODFX-C/FIXNUM=>FIXNUM" name))))
`(progn
(define-modular-fun ,fun64 (x y) ,name :untagged nil 64)
- (define-modular-fun ,sfun61 (x y) ,name :tagged t 61)
+ (define-modular-fun ,funfx (x y) ,name :tagged t
+ #.(- n-word-bits n-fixnum-tag-bits))
(define-mod-binop (,vop64u ,vopu) ,fun64)
(define-vop (,vop64f ,vopf) (:translate ,fun64))
- (define-vop (,svop61f ,vopf) (:translate ,sfun61))
+ (define-vop (,vopfxf ,vopf) (:translate ,funfx))
,@(when -c-p
`((define-mod-binop-c (,vop64cu ,vopcu) ,fun64)
- (define-vop (,svop61cf ,vopcf) (:translate ,sfun61))))))))
+ (define-vop (,vopfxcf ,vopcf) (:translate ,funfx))))))))
(def + t)
(def - t)
(def * t))
(sb!c::give-up-ir1-transform))
'(%primitive fast-ash-left-mod64/unsigned=>unsigned integer count))
-(define-vop (fast-ash-left-smod61-c/fixnum=>fixnum
+(define-vop (fast-ash-left-modfx-c/fixnum=>fixnum
fast-ash-c/fixnum=>fixnum)
(:variant :modular)
- (:translate ash-left-smod61))
-(define-vop (fast-ash-left-smod61/fixnum=>fixnum
+ (:translate ash-left-modfx))
+(define-vop (fast-ash-left-modfx/fixnum=>fixnum
fast-ash-left/fixnum=>fixnum))
-(deftransform ash-left-smod61 ((integer count)
- ((signed-byte 61) (unsigned-byte 6)))
+(deftransform ash-left-modfx ((integer count)
+ (fixnum (unsigned-byte 6)))
(when (sb!c::constant-lvar-p count)
(sb!c::give-up-ir1-transform))
- '(%primitive fast-ash-left-smod61/fixnum=>fixnum integer count))
+ '(%primitive fast-ash-left-modfx/fixnum=>fixnum integer count))
(in-package "SB!C")
(defknown sb!vm::%lea-mod64 (integer integer (member 1 2 4 8) (signed-byte 64))
(unsigned-byte 64)
(foldable flushable movable))
-(defknown sb!vm::%lea-smod61 (integer integer (member 1 2 4 8) (signed-byte 64))
- (signed-byte 61)
+(defknown sb!vm::%lea-modfx (integer integer (member 1 2 4 8) (signed-byte 64))
+ fixnum
(foldable flushable movable))
(define-modular-fun-optimizer %lea ((base index scale disp) :untagged nil :width width)
(cut-to-width index :untagged width nil)
'sb!vm::%lea-mod64))
(define-modular-fun-optimizer %lea ((base index scale disp) :tagged t :width width)
- (when (and (<= width 61)
+ (when (and (<= width (- sb!vm:n-word-bits sb!vm:n-fixnum-tag-bits))
(constant-lvar-p scale)
(constant-lvar-p disp))
(cut-to-width base :tagged width t)
(cut-to-width index :tagged width t)
- 'sb!vm::%lea-smod61))
+ 'sb!vm::%lea-modfx))
#+sb-xc-host
(progn
(defun sb!vm::%lea-mod64 (base index scale disp)
(ldb (byte 64 0) (%lea base index scale disp)))
- (defun sb!vm::%lea-smod61 (base index scale disp)
- (mask-signed-field 61 (%lea base index scale disp))))
+ (defun sb!vm::%lea-modfx (base index scale disp)
+ (mask-signed-field (- sb!vm:n-word-bits sb!vm:n-fixnum-tag-bits)
+ (%lea base index scale disp))))
#-sb-xc-host
(progn
(defun sb!vm::%lea-mod64 (base index scale disp)
;; can't use modular version of %LEA, as we only have VOPs for
;; constant SCALE and DISP.
(ldb (byte 64 0) (+ base (* index scale) disp))))
- (defun sb!vm::%lea-smod61 (base index scale disp)
- (let ((base (mask-signed-field 61 base))
- (index (mask-signed-field 61 index)))
+ (defun sb!vm::%lea-modfx (base index scale disp)
+ (let* ((fixnum-width (- sb!vm:n-word-bits sb!vm:n-fixnum-tag-bits))
+ (base (mask-signed-field fixnum-width base))
+ (index (mask-signed-field fixnum-width index)))
;; can't use modular version of %LEA, as we only have VOPs for
;; constant SCALE and DISP.
- (mask-signed-field 61 (+ base (* index scale) disp)))))
+ (mask-signed-field fixnum-width (+ base (* index scale) disp)))))
(in-package "SB!VM")
(define-vop (%lea-mod64/unsigned=>unsigned
%lea/unsigned=>unsigned)
(:translate %lea-mod64))
-(define-vop (%lea-smod61/fixnum=>fixnum
+(define-vop (%lea-modfx/fixnum=>fixnum
%lea/fixnum=>fixnum)
- (:translate %lea-smod61))
+ (:translate %lea-modfx))
;;; logical operations
(define-modular-fun lognot-mod64 (x) lognot :untagged nil 64)
(:arg-types unsigned-num)
(:conditional :ns)
(:generator 3
- (inst or digit digit)))
+ (inst test digit digit)))
;;; For add and sub with carry the sc of carry argument is any-reg so
(move hi edx)
(move lo eax)))
+#!+multiply-high-vops
+(define-vop (mulhi)
+ (:translate sb!kernel:%multiply-high)
+ (:policy :fast-safe)
+ (: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 :from (:argument 0))
+ eax)
+ (:temporary (:sc unsigned-reg :offset edx-offset :from (:argument 1)
+ :to (:result 0) :target hi) edx)
+ (:results (hi :scs (unsigned-reg)))
+ (:result-types unsigned-num)
+ (:generator 20
+ (move eax x)
+ (inst mul eax y)
+ (move hi edx)))
+
+#!+multiply-high-vops
+(define-vop (mulhi/fx)
+ (:translate sb!kernel:%multiply-high)
+ (:policy :fast-safe)
+ (:args (x :scs (any-reg) :target eax)
+ (y :scs (unsigned-reg unsigned-stack)))
+ (:arg-types positive-fixnum unsigned-num)
+ (:temporary (:sc any-reg :offset eax-offset :from (:argument 0)) eax)
+ (:temporary (:sc any-reg :offset edx-offset :from (:argument 1)
+ :to (:result 0) :target hi) edx)
+ (:results (hi :scs (any-reg)))
+ (:result-types positive-fixnum)
+ (:generator 15
+ (move eax x)
+ (inst mul eax y)
+ (move hi edx)
+ (inst and hi (lognot fixnum-tag-mask))))
+
(define-vop (bignum-lognot lognot-mod64/unsigned=>unsigned)
(:translate sb!bignum:%lognot))
(:result-types unsigned-num)
(:generator 1
(move digit fixnum)
- (inst sar digit 3)))
+ (inst sar digit n-fixnum-tag-bits)))
(define-vop (bignum-floor)
(:translate sb!bignum:%bigfloor)
(:generator 1
(move res digit)
(when (sc-is res any-reg control-stack)
- (inst shl res 3))))
+ (inst shl res n-fixnum-tag-bits))))
(define-vop (digit-ashr)
(:translate sb!bignum:%ashr)
(*-transformer y)))
(deftransform * ((x y)
- ((signed-byte 61) (constant-arg (unsigned-byte 64)))
- (signed-byte 61))
+ (fixnum (constant-arg (unsigned-byte 64)))
+ fixnum)
"recode as leas, shifts and adds"
(let ((y (lvar-value y)))
(*-transformer y)))
-(deftransform sb!vm::*-smod61
- ((x y) ((signed-byte 61) (constant-arg (unsigned-byte 64)))
- (signed-byte 61))
+(deftransform sb!vm::*-modfx
+ ((x y) (fixnum (constant-arg (unsigned-byte 64)))
+ fixnum)
"recode as leas, shifts and adds"
(let ((y (lvar-value y)))
(*-transformer y)))
projects / sbcl.git / blobdiff