(symbol
(load-symbol y val))
(character
- (inst mov y (logior (ash (char-code val) type-bits)
- base-char-type))))))
+ (inst mov y (logior (ash (char-code val) n-widetag-bits)
+ base-char-widetag))))))
(define-move-function (load-number 1) (vop x y)
((immediate) (signed-reg unsigned-reg))
(symbol
(inst mov y (+ nil-value (static-symbol-offset val))))
(character
- (inst mov y (logior (ash (char-code val) type-bits)
- base-char-type)))))
+ (inst mov y (logior (ash (char-code val) n-widetag-bits)
+ base-char-widetag)))))
(move y x))))
(define-move-vop move :move
(symbol
(load-symbol y val))
(character
- (inst mov y (logior (ash (char-code val) type-bits)
- base-char-type)))))
+ (inst mov y (logior (ash (char-code val) n-widetag-bits)
+ base-char-widetag)))))
(move y x)))
((control-stack)
(if (sc-is x immediate)
(storew (+ nil-value (static-symbol-offset val))
fp (tn-offset y)))
(character
- (storew (logior (ash (char-code val) type-bits)
- base-char-type)
+ (storew (logior (ash (char-code val) n-widetag-bits)
+ base-char-widetag)
fp (tn-offset y))))
;; Lisp stack
(etypecase val
(storew (+ nil-value (static-symbol-offset val))
fp (- (1+ (tn-offset y)))))
(character
- (storew (logior (ash (char-code val) type-bits)
- base-char-type)
+ (storew (logior (ash (char-code val) n-widetag-bits)
+ base-char-widetag)
fp (- (1+ (tn-offset y))))))))
(if (= (tn-offset fp) esp-offset)
;; C-call
(move eax x)
(inst test al-tn 3)
(inst jmp :z fixnum)
- (loadw y eax bignum-digits-offset other-pointer-type)
+ (loadw y eax bignum-digits-offset other-pointer-lowtag)
(inst jmp done)
FIXNUM
(inst sar eax 2)
(inst jmp :o bignum)
(emit-label done)
;; KLUDGE: The sequence above leaves a DESCRIPTOR-REG Y in a
- ;; non-descriptor state for a while. Does that matter? Does it matter in
- ;; GENGC but not in GENCGC? Is this written down anywhere?
+ ;; non-descriptor state for a while. Does that matter? Does it
+ ;; matter in GENGC but not in GENCGC? Is this written down
+ ;; anywhere?
;; -- WHN 19990916
;;
;; Also, the sequence above seems rather twisty. Why not something
(assemble (*elsewhere*)
(emit-label bignum)
(with-fixed-allocation
- (y bignum-type (+ bignum-digits-offset 1) node)
- (storew x y bignum-digits-offset other-pointer-type))
+ (y bignum-widetag (+ bignum-digits-offset 1) node)
+ (storew x y bignum-digits-offset other-pointer-lowtag))
(inst jmp done)))))
(define-move-vop move-from-signed :move
(signed-reg) (descriptor-reg))
;; always allocated and the header size is set to either one
;; or two words as appropriate.
(inst jmp :ns one-word-bignum)
- ;; Two word bignum.
+ ;; two word bignum
(inst mov y (logior (ash (1- (+ bignum-digits-offset 2))
- sb!vm:type-bits)
- bignum-type))
+ sb!vm:n-widetag-bits)
+ bignum-widetag))
(inst jmp L1)
(emit-label one-word-bignum)
(inst mov y (logior (ash (1- (+ bignum-digits-offset 1))
- sb!vm:type-bits)
- bignum-type))
+ sb!vm:n-widetag-bits)
+ bignum-widetag))
(emit-label L1)
(pseudo-atomic
(allocation alloc (pad-data-block (+ bignum-digits-offset 2)) node)
(storew y alloc)
- (inst lea y (make-ea :byte :base alloc :disp other-pointer-type))
- (storew x y bignum-digits-offset other-pointer-type))
+ (inst lea y (make-ea :byte :base alloc :disp other-pointer-lowtag))
+ (storew x y bignum-digits-offset other-pointer-lowtag))
(inst jmp done)))))
(define-move-vop move-from-unsigned :move
(unsigned-reg) (descriptor-reg))