(any-reg descriptor-reg zero null)
(any-reg descriptor-reg))
-;;; Make Move the check VOP for T so that type check generation
+;;; Make MOVE the check VOP for T so that type check generation
;;; doesn't think it is a hairy type. This also allows checking of a
;;; few of the values in a continuation to fall out.
(primitive-type-vop move (:check) t)
-;;; The Move-Argument VOP is used for moving descriptor values into
+;;; The MOVE-ARG VOP is used for moving descriptor values into
;;; another frame for argument or known value passing.
-(define-vop (move-argument)
+(define-vop (move-arg)
(:args (x :target y
:scs (any-reg descriptor-reg null zero))
(fp :scs (any-reg)
(control-stack
(storew x fp (tn-offset y))))))
;;;
-(define-move-vop move-argument :move-argument
+(define-move-vop move-arg :move-arg
(any-reg descriptor-reg null zero)
(any-reg descriptor-reg))
\f
(:arg-types tagged-num)
(:note "fixnum untagging")
(:generator 1
- (inst sra x 2 y)))
+ (inst sra x n-fixnum-tag-bits y)))
;;;
(define-move-vop move-to-word/fixnum :move
(any-reg descriptor-reg) (signed-reg unsigned-reg))
(:temporary (:sc non-descriptor-reg) header)
(:temporary (:scs (non-descriptor-reg)) temp)
(:generator 3
- (inst and x 3 temp)
- (inst sra x 2 y)
+ (inst and x fixnum-tag-mask temp)
+ (inst sra x n-fixnum-tag-bits y)
(inst beq temp done)
(loadw header x 0 other-pointer-lowtag)
(:result-types tagged-num)
(:note "fixnum tagging")
(:generator 1
- (inst sll x 2 y)))
+ (inst sll x n-fixnum-tag-bits y)))
;;;
(define-move-vop move-from-word/fixnum :move
(signed-reg unsigned-reg) (any-reg descriptor-reg))
(:note "signed word to integer coercion")
(:generator 18
(move arg x)
- (inst sra x 29 temp)
- (inst sll x 2 y)
+ (inst sra x n-positive-fixnum-bits temp)
+ (inst sll x n-fixnum-tag-bits y)
(inst beq temp done)
(inst not temp temp)
(inst beq temp done)
(:note "unsigned word to integer coercion")
(:generator 20
(move arg x)
- (inst srl x 29 temp)
- (inst sll x 2 y)
+ (inst srl x n-positive-fixnum-bits temp)
+ (inst sll x n-fixnum-tag-bits y)
(inst beq temp done)
(inst li 3 temp)
(signed-reg unsigned-reg) (signed-reg unsigned-reg))
;;; Move untagged number arguments/return-values.
-(define-vop (move-word-argument)
+(define-vop (move-word-arg)
(:args (x :target y
:scs (signed-reg unsigned-reg))
(fp :scs (any-reg)
((signed-stack unsigned-stack)
(storeq x fp (tn-offset y))))))
;;;
-(define-move-vop move-word-argument :move-argument
+(define-move-vop move-word-arg :move-arg
(descriptor-reg any-reg signed-reg unsigned-reg) (signed-reg unsigned-reg))
-;;; Use standard MOVE-ARGUMENT + coercion to move an untagged number
+;;; Use standard MOVE-ARG + coercion to move an untagged number
;;; to a descriptor passing location.
-(define-move-vop move-argument :move-argument
+(define-move-vop move-arg :move-arg
(signed-reg unsigned-reg) (any-reg descriptor-reg))