(t
(move result number)
(cond ((< -32 amount 32)
- ;; this code is used both in ASH and ASH-SMOD30, so
+ ;; this code is used both in ASH and ASH-MODFX, so
;; be careful
(if (plusp amount)
(inst shl result amount)
(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 xor result result)
(inst mov result 0)))
(t (inst sar result 31)
(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 31)
(: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 31)
DONE))
+#!+ash-right-vops
+(define-vop (fast-%ash/right/unsigned)
+ (:translate %ash/right)
+ (:policy :fast-safe)
+ (:args (number :scs (unsigned-reg) :target result)
+ (amount :scs (unsigned-reg) :target ecx))
+ (:arg-types unsigned-num unsigned-num)
+ (:results (result :scs (unsigned-reg) :from (:argument 0)))
+ (:result-types unsigned-num)
+ (:temporary (:sc signed-reg :offset ecx-offset :from (:argument 1)) ecx)
+ (:generator 4
+ (move result number)
+ (move ecx amount)
+ (inst shr result :cl)))
+
+#!+ash-right-vops
+(define-vop (fast-%ash/right/signed)
+ (:translate %ash/right)
+ (:policy :fast-safe)
+ (:args (number :scs (signed-reg) :target result)
+ (amount :scs (unsigned-reg) :target ecx))
+ (:arg-types signed-num unsigned-num)
+ (:results (result :scs (signed-reg) :from (:argument 0)))
+ (:result-types signed-num)
+ (:temporary (:sc signed-reg :offset ecx-offset :from (:argument 1)) ecx)
+ (:generator 4
+ (move result number)
+ (move ecx amount)
+ (inst sar result :cl)))
+
+#!+ash-right-vops
+(define-vop (fast-%ash/right/fixnum)
+ (:translate %ash/right)
+ (:policy :fast-safe)
+ (:args (number :scs (any-reg) :target result)
+ (amount :scs (unsigned-reg) :target ecx))
+ (:arg-types tagged-num unsigned-num)
+ (:results (result :scs (any-reg) :from (:argument 0)))
+ (:result-types tagged-num)
+ (:temporary (:sc signed-reg :offset ecx-offset :from (:argument 1)) ecx)
+ (:generator 3
+ (move result number)
+ (move ecx amount)
+ (inst sar result :cl)
+ (inst and result (lognot fixnum-tag-mask))))
+
(in-package "SB!C")
(defknown %lea (integer integer (member 1 2 4 8) (signed-byte 32))
(:generator 4
(move result number)
(move ecx amount)
- (inst or ecx ecx)
+ (inst test ecx ecx)
(inst jmp :ns positive)
(inst neg ecx)
(inst xor zero zero)
cond
unsigned))
(:generator ,cost
- (inst cmp x
- ,(if (eq suffix '-c/fixnum)
- '(fixnumize y)
- 'y)))))
+ (cond ((and (sc-is x any-reg signed-reg unsigned-reg)
+ (eql y 0))
+ (inst test x x))
+ (t
+ (inst cmp x
+ ,(if (eq suffix '-c/fixnum)
+ '(fixnumize y)
+ 'y)))))))
'(/fixnum -c/fixnum /signed -c/signed /unsigned -c/unsigned)
'(4 3 6 5 6 5)
'(t t t t nil nil)))))
(vop32f (intern (format nil "FAST-~S-MOD32/FIXNUM=>FIXNUM" name)))
(vop32cu (intern (format nil "FAST-~S-MOD32-C/WORD=>UNSIGNED" name)))
(vop32cf (intern (format nil "FAST-~S-MOD32-C/FIXNUM=>FIXNUM" name)))
- (sfun30 (intern (format nil "~S-SMOD30" name)))
- (svop30f (intern (format nil "FAST-~S-SMOD30/FIXNUM=>FIXNUM" name)))
- (svop30cf (intern (format nil "FAST-~S-SMOD30-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 ,fun32 (x y) ,name :untagged nil 32)
- (define-modular-fun ,sfun30 (x y) ,name :tagged t 30)
+ (define-modular-fun ,funfx (x y) ,name :tagged t
+ #.(- n-word-bits n-fixnum-tag-bits))
(define-mod-binop (,vop32u ,vopu) ,fun32)
(define-vop (,vop32f ,vopf) (:translate ,fun32))
- (define-vop (,svop30f ,vopf) (:translate ,sfun30))
+ (define-vop (,vopfxf ,vopf) (:translate ,funfx))
,@(when -c-p
`((define-mod-binop-c (,vop32cu ,vopcu) ,fun32)
- (define-vop (,svop30cf ,vopcf) (:translate ,sfun30))))))))
+ (define-vop (,vopfxcf ,vopcf) (:translate ,funfx))))))))
(def + t)
(def - t)
;; (no -C variant as x86 MUL instruction doesn't take an immediate)
(def * nil))
+(define-modular-fun %negate-mod32 (x) %negate :untagged nil 32)
+(define-vop (%negate-mod32)
+ (:translate %negate-mod32)
+ (:policy :fast-safe)
+ (:args (x :scs (unsigned-reg) :target r))
+ (:arg-types unsigned-num)
+ (:results (r :scs (unsigned-reg)))
+ (:result-types unsigned-num)
+ (:generator 3
+ (move r x)
+ (inst neg r)))
+
+(define-modular-fun %negate-modfx (x) %negate :tagged t #.(- n-word-bits
+ n-fixnum-tag-bits))
+(define-vop (%negate-modfx fast-negate/fixnum)
+ (:translate %negate-modfx))
(define-vop (fast-ash-left-mod32-c/unsigned=>unsigned
fast-ash-c/unsigned=>unsigned)
(sb!c::give-up-ir1-transform))
'(%primitive fast-ash-left-mod32/unsigned=>unsigned integer count))
-(define-vop (fast-ash-left-smod30-c/fixnum=>fixnum
+(define-vop (fast-ash-left-modfx-c/fixnum=>fixnum
fast-ash-c/fixnum=>fixnum)
(:variant :modular)
- (:translate ash-left-smod30))
+ (:translate ash-left-modfx))
-(define-vop (fast-ash-left-smod30/fixnum=>fixnum
+(define-vop (fast-ash-left-modfx/fixnum=>fixnum
fast-ash-left/fixnum=>fixnum))
-(deftransform ash-left-smod30 ((integer count)
- ((signed-byte 30) (unsigned-byte 5)))
+(deftransform ash-left-modfx ((integer count)
+ (fixnum (unsigned-byte 5)))
(when (sb!c::constant-lvar-p count)
(sb!c::give-up-ir1-transform))
- '(%primitive fast-ash-left-smod30/fixnum=>fixnum integer count))
+ '(%primitive fast-ash-left-modfx/fixnum=>fixnum integer count))
(in-package "SB!C")
(defknown sb!vm::%lea-mod32 (integer integer (member 1 2 4 8) (signed-byte 32))
(unsigned-byte 32)
(foldable flushable movable))
-(defknown sb!vm::%lea-smod30 (integer integer (member 1 2 4 8) (signed-byte 32))
- (signed-byte 30)
+(defknown sb!vm::%lea-modfx (integer integer (member 1 2 4 8) (signed-byte 32))
+ 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-mod32))
(define-modular-fun-optimizer %lea ((base index scale disp) :tagged t :width width)
- (when (and (<= width 30)
+ (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-smod30))
+ 'sb!vm::%lea-modfx))
#+sb-xc-host
(progn
(defun sb!vm::%lea-mod32 (base index scale disp)
(ldb (byte 32 0) (%lea base index scale disp)))
- (defun sb!vm::%lea-smod30 (base index scale disp)
- (mask-signed-field 30 (%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-mod32 (base index scale disp)
;; can't use modular version of %LEA, as we only have VOPs for
;; constant SCALE and DISP.
(ldb (byte 32 0) (+ base (* index scale) disp))))
- (defun sb!vm::%lea-smod30 (base index scale disp)
- (let ((base (mask-signed-field 30 base))
- (index (mask-signed-field 30 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 30 (+ base (* index scale) disp)))))
+ (mask-signed-field fixnum-width (+ base (* index scale) disp)))))
(in-package "SB!VM")
(define-vop (%lea-mod32/unsigned=>unsigned
%lea/unsigned=>unsigned)
(:translate %lea-mod32))
-(define-vop (%lea-smod30/fixnum=>fixnum
+(define-vop (%lea-modfx/fixnum=>fixnum
%lea/fixnum=>fixnum)
- (:translate %lea-smod30))
+ (:translate %lea-modfx))
;;; logical operations
(define-modular-fun lognot-mod32 (x) lognot :untagged nil 32)
(: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-mod32/word=>unsigned)
(:translate sb!bignum:%lognot))
(inst sar digit n-fixnum-tag-bits)))
(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)
(*-transformer :unsigned 32 y)))
(deftransform * ((x y)
- ((signed-byte 30) (constant-arg (unsigned-byte 32)))
- (signed-byte 30))
+ (fixnum (constant-arg (unsigned-byte 32)))
+ fixnum)
"recode as leas, shifts and adds"
(let ((y (lvar-value y)))
- (*-transformer :signed 30 y)))
-(deftransform sb!vm::*-smod30
- ((x y) ((signed-byte 30) (constant-arg (unsigned-byte 32)))
- (signed-byte 30))
+ (*-transformer :signed (- sb!vm:n-word-bits sb!vm:n-fixnum-tag-bits) y)))
+(deftransform sb!vm::*-modfx
+ ((x y) (fixnum (constant-arg (unsigned-byte 32)))
+ fixnum)
"recode as leas, shifts and adds"
(let ((y (lvar-value y)))
- (*-transformer :signed 30 y)))
+ (*-transformer :signed (- sb!vm:n-word-bits sb!vm:n-fixnum-tag-bits) y)))
;;; FIXME: we should also be able to write an optimizer or two to
;;; convert (+ (* x 2) 17), (- (* x 9) 5) to a %LEA.
projects / sbcl.git / blobdiff