(load-symbol y val))
(character
(inst li y (logior (ash (char-code val) n-widetag-bits)
- character-widetag))))))
+ character-widetag))))))
(define-move-fun (load-number 1) (vop x y)
((zero immediate)
;;;
(define-vop (move)
(:args (x :target y
- :scs (any-reg descriptor-reg zero null)
- :load-if (not (location= x y))))
+ :scs (any-reg descriptor-reg zero null)
+ :load-if (not (location= x y))))
(:results (y :scs (any-reg descriptor-reg control-stack)
- :load-if (not (location= x y))))
+ :load-if (not (location= x y))))
(:effects)
(:affected)
(:generator 0
(unless (location= x y)
(sc-case y
- ((any-reg descriptor-reg)
- (inst move y x))
- (control-stack
- (store-stack-tn y x))))))
+ ((any-reg descriptor-reg)
+ (inst move y x))
+ (control-stack
+ (store-stack-tn y x))))))
(define-move-vop move :move
(any-reg descriptor-reg zero null)
;;;
(define-vop (move-arg)
(:args (x :target y
- :scs (any-reg descriptor-reg null zero))
- (fp :scs (any-reg)
- :load-if (not (sc-is y any-reg descriptor-reg))))
+ :scs (any-reg descriptor-reg null zero))
+ (fp :scs (any-reg)
+ :load-if (not (sc-is y any-reg descriptor-reg))))
(:results (y))
(:generator 0
(sc-case y
(:arg-types tagged-num)
(:note "fixnum untagging")
(:generator 1
- (inst sra y x 2)))
+ (inst sra y x n-fixnum-tag-bits)))
;;;
(define-move-vop move-to-word/fixnum :move
(any-reg descriptor-reg) (signed-reg unsigned-reg))
(:results (y :scs (signed-reg unsigned-reg)))
(:note "constant load")
(:generator 1
- (inst li y (tn-value x))))
+ (cond ((sb!c::tn-leaf x)
+ (inst li y (tn-value x)))
+ (t
+ (loadw y code-tn (tn-offset x) other-pointer-lowtag)
+ (inst sra y y n-fixnum-tag-bits)))))
;;;
(define-move-vop move-to-word-c :move
(constant) (signed-reg unsigned-reg))
(:temporary (:scs (non-descriptor-reg)) temp)
(:generator 3
(let ((done (gen-label)))
- (inst and temp x 3)
+ (inst and temp x fixnum-tag-mask)
(inst beq temp done)
- (inst sra y x 2)
+ (inst sra y x n-fixnum-tag-bits)
(loadw y x bignum-digits-offset other-pointer-lowtag)
(emit-label done))))
(:result-types tagged-num)
(:note "fixnum tagging")
(:generator 1
- (inst sll y x 2)))
+ (inst sll y x n-fixnum-tag-bits)))
;;;
(define-move-vop move-from-word/fixnum :move
(signed-reg unsigned-reg) (any-reg descriptor-reg))
(:generator 18
(move x arg)
(let ((fixnum (gen-label))
- (done (gen-label)))
- (inst sra temp x 29)
+ (done (gen-label)))
+ (inst sra temp x n-positive-fixnum-bits)
(inst beq temp fixnum)
(inst nor temp zero-tn)
(inst beq temp done)
- (inst sll y x 2)
-
+ (inst sll y x n-fixnum-tag-bits)
+
(with-fixed-allocation
- (y pa-flag temp bignum-widetag (1+ bignum-digits-offset))
- (storew x y bignum-digits-offset other-pointer-lowtag))
+ (y pa-flag temp bignum-widetag (1+ bignum-digits-offset) nil)
+ (storew x y bignum-digits-offset other-pointer-lowtag))
(inst b done)
(inst nop)
-
+
(emit-label fixnum)
- (inst sll y x 2)
+ (inst sll y x n-fixnum-tag-bits)
(emit-label done))))
;;;
(define-move-vop move-from-signed :move
(:note "unsigned word to integer coercion")
(:generator 20
(move x arg)
- (inst srl temp x 29)
+ (inst srl temp x n-positive-fixnum-bits)
(inst beq temp done)
- (inst sll y x 2)
-
+ (inst sll y x n-fixnum-tag-bits)
+
(pseudo-atomic
(pa-flag :extra (pad-data-block (+ bignum-digits-offset 2)))
(inst or y alloc-tn other-pointer-lowtag)
;;;
(define-vop (word-move)
(:args (x :target y
- :scs (signed-reg unsigned-reg)
- :load-if (not (location= x y))))
+ :scs (signed-reg unsigned-reg)
+ :load-if (not (location= x y))))
(:results (y :scs (signed-reg unsigned-reg)
- :load-if (not (location= x y))))
+ :load-if (not (location= x y))))
(:effects)
(:affected)
(:note "word integer move")
;;;
(define-vop (move-word-arg)
(:args (x :target y
- :scs (signed-reg unsigned-reg))
- (fp :scs (any-reg)
- :load-if (not (sc-is y sap-reg))))
+ :scs (signed-reg unsigned-reg))
+ (fp :scs (any-reg)
+ :load-if (not (sc-is y sap-reg))))
(:results (y))
(:note "word integer argument move")
(:generator 0