`((define-vop (,check-name ,(intern (concatenate 'string prefix "CHECK-TYPE")))
(:generator ,cost
(let ((err-lab
- (generate-error-code vop ,error-code value)))
+ (generate-error-code vop ',error-code value)))
(test-type value err-lab t (,@type-codes))
(move result value))))))
,@(when ptype
(define-vop (fixnump/unsigned-byte-32 simple-type-predicate)
(:args (value :scs (unsigned-reg)))
+ (:info)
+ (:conditional :be)
(:arg-types unsigned-num)
(:translate fixnump)
(:generator 5
- (inst cmp value #.sb!xc:most-positive-fixnum)
- (inst jmp (if not-p :a :be) target)))
+ ;; We could encode this with :Z and SHR, analogously to the signed-byte-32
+ ;; case below -- as we do on x86-64 -- but that costs us an extra
+ ;; register. Compromises...
+ (inst cmp value #.sb!xc:most-positive-fixnum)))
+
+(define-vop (fixnump/signed-byte-32 type-predicate)
+ (:args (value :scs (signed-reg)))
+ (:info)
+ (:conditional :z)
+ (:arg-types signed-num)
+ (:translate fixnump)
+ (:generator 5
+ ;; Hackers Delight, p. 53: signed
+ ;; a <= x <= a + 2^n - 1
+ ;; is equivalent to unsigned
+ ;; ((x-a) >> n) = 0
+ (inst mov eax-tn value)
+ (inst sub eax-tn #.sb!xc:most-negative-fixnum)
+ (inst shr eax-tn #.(integer-length (- sb!xc:most-positive-fixnum
+ sb!xc:most-negative-fixnum)))))
;;; A (SIGNED-BYTE 32) can be represented with either fixnum or a bignum with
;;; exactly one digit.
(define-vop (check-signed-byte-32 check-type)
(:generator 45
(let ((nope (generate-error-code vop
- object-not-signed-byte-32-error
+ 'object-not-signed-byte-32-error
value)))
(generate-fixnum-test value)
(inst jmp :e yep)
(define-vop (check-unsigned-byte-32 check-type)
(:generator 45
(let ((nope
- (generate-error-code vop object-not-unsigned-byte-32-error value))
+ (generate-error-code vop 'object-not-unsigned-byte-32-error value))
(yep (gen-label))
(fixnum (gen-label))
(single-word (gen-label)))
(define-vop (check-symbol check-type)
(:generator 12
- (let ((error (generate-error-code vop object-not-symbol-error value)))
+ (let ((error (generate-error-code vop 'object-not-symbol-error value)))
(inst cmp value nil-value)
(inst jmp :e drop-thru)
(test-type value error t (symbol-header-widetag)))
(define-vop (check-cons check-type)
(:generator 8
- (let ((error (generate-error-code vop object-not-cons-error value)))
+ (let ((error (generate-error-code vop 'object-not-cons-error value)))
(inst cmp value nil-value)
(inst jmp :e error)
(test-type value error t (list-pointer-lowtag))