- (inst srwi y x sb!vm:n-widetag-bits)))
-
-(define-move-vop move-to-base-char :move
- (any-reg descriptor-reg) (base-char-reg))
-
+ (inst srwi y x n-widetag-bits)))
+(define-move-vop move-to-character :move
+ (any-reg descriptor-reg) (character-reg))
- (inst slwi y x sb!vm:n-widetag-bits)
- (inst ori y y sb!vm:base-char-widetag)))
-
-(define-move-vop move-from-base-char :move
- (base-char-reg) (any-reg descriptor-reg))
+ (inst slwi y x n-widetag-bits)
+ (inst ori y y character-widetag)))
+(define-move-vop move-from-character :move
+ (character-reg) (any-reg descriptor-reg))
- :scs (base-char-reg)
- :load-if (not (location= x y))))
- (:results (y :scs (base-char-reg)
- :load-if (not (location= x y))))
+ :scs (character-reg)
+ :load-if (not (location= x y))))
+ (:results (y :scs (character-reg)
+ :load-if (not (location= x y))))
-(define-move-vop base-char-move :move
- (base-char-reg) (base-char-reg))
-
-;;; Move untagged base-char arguments/return-values.
-(define-vop (move-base-char-arg)
+;;; Move untagged character arguments/return-values.
+(define-vop (move-character-arg)
-(define-move-vop move-base-char-arg :move-arg
- (any-reg base-char-reg) (base-char-reg))
-
-
-;;; Use standard MOVE-ARG + coercion to move an untagged base-char
+;;; Use standard MOVE-ARG + coercion to move an untagged character
-;;; Comparison of base-chars.
-(define-vop (base-char-compare)
- (:args (x :scs (base-char-reg))
- (y :scs (base-char-reg)))
- (:arg-types base-char base-char)
+;;; Comparison of characters.
+(define-vop (character-compare)
+ (:args (x :scs (character-reg))
+ (y :scs (character-reg)))
+ (:arg-types character character)
-(define-vop (base-char-compare/c)
- (:args (x :scs (base-char-reg)))
- (:arg-types base-char (:constant base-char))
+(define-vop (character-compare/c)
+ (:args (x :scs (character-reg)))
+ (:arg-types character (:constant character))