(load-symbol y val))
(character
(inst li y (logior (ash (char-code val) n-widetag-bits)
- base-char-widetag))))))
+ character-widetag))))))
(define-move-fun (load-number 1) (vop x y)
((immediate zero)
(signed-reg unsigned-reg))
(inst li y (tn-value x)))
-(define-move-fun (load-base-char 1) (vop x y)
- ((immediate) (base-char-reg))
+(define-move-fun (load-character 1) (vop x y)
+ ((immediate) (character-reg))
(inst li y (char-code (tn-value x))))
(define-move-fun (load-system-area-pointer 1) (vop x y)
(load-stack-tn y x))
(define-move-fun (load-number-stack 5) (vop x y)
- ((base-char-stack) (base-char-reg)
+ ((character-stack) (character-reg)
(sap-stack) (sap-reg)
(signed-stack) (signed-reg)
(unsigned-stack) (unsigned-reg))
(store-stack-tn y x))
(define-move-fun (store-number-stack 5) (vop x y)
- ((base-char-reg) (base-char-stack)
+ ((character-reg) (character-stack)
(sap-reg) (sap-stack)
(signed-reg) (signed-stack)
(unsigned-reg) (unsigned-stack))
(:arg-types tagged-num)
(:note "fixnum untagging")
(:generator 1
- (inst sra y x fixnum-tag-bits)))
+ (inst sra y x n-fixnum-tag-bits)))
(define-move-vop move-to-word/fixnum :move
(any-reg descriptor-reg) (signed-reg unsigned-reg))
(let ((done (gen-label)))
(inst andcc temp x fixnum-tag-mask)
(inst b :eq done)
- (inst sra y x fixnum-tag-bits)
+ (inst sra y x n-fixnum-tag-bits)
(loadw y x bignum-digits-offset other-pointer-lowtag)
(:result-types tagged-num)
(:note "fixnum tagging")
(:generator 1
- (inst sll y x fixnum-tag-bits)))
+ (inst sll y x n-fixnum-tag-bits)))
(define-move-vop move-from-word/fixnum :move
(signed-reg unsigned-reg) (any-reg descriptor-reg))
(move x arg)
(let ((fixnum (gen-label))
(done (gen-label)))
- (inst sra temp x positive-fixnum-bits)
+ (inst sra temp x n-positive-fixnum-bits)
(inst cmp temp)
(inst b :eq fixnum)
(inst orncc temp zero-tn temp)
(inst b :eq done)
- (inst sll y x fixnum-tag-bits)
+ (inst sll y x n-fixnum-tag-bits)
(with-fixed-allocation
(y temp bignum-widetag (1+ bignum-digits-offset))
(inst nop)
(emit-label fixnum)
- (inst sll y x fixnum-tag-bits)
+ (inst sll y x n-fixnum-tag-bits)
(emit-label done))))
(define-move-vop move-from-signed :move
(:generator 20
(move x arg)
(let ((done (gen-label))
- (one-word (gen-label))
- (initial-alloc (pad-data-block (1+ bignum-digits-offset))))
- (inst sra temp x positive-fixnum-bits)
+ (one-word (gen-label)))
+ (inst sra temp x n-positive-fixnum-bits)
(inst cmp temp)
(inst b :eq done)
- (inst sll y x fixnum-tag-bits)
+ (inst sll y x n-fixnum-tag-bits)
;; We always allocate 2 words even if we don't need it. (The
;; copying GC will take care of freeing the unused extra word.)