X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fchar.lisp;h=48825d32063874f338aec4941252559fc1ac3e51;hb=f7c047cafd84b556398014c4932c90dba55a5c0d;hp=5a73ff2c1bd2a73b501e92583de425ff78ac6393;hpb=63fcb94b875a97e468d9add229e220ecceec2352;p=sbcl.git

diff --git a/src/compiler/alpha/char.lisp b/src/compiler/alpha/char.lisp
index 5a73ff2..48825d3 100644
--- a/src/compiler/alpha/char.lisp
+++ b/src/compiler/alpha/char.lisp
@@ -14,94 +14,87 @@
 ;;;; moves and coercions
 
 ;;; Move a tagged char to an untagged representation.
-(define-vop (move-to-base-char)
+(define-vop (move-to-character)
   (:args (x :scs (any-reg descriptor-reg)))
-  (:results (y :scs (base-char-reg)))
+  (:results (y :scs (character-reg)))
   (:generator 1
-    (inst srl x sb!vm:type-bits y)))
-;;;
-(define-move-vop move-to-base-char :move
-  (any-reg descriptor-reg) (base-char-reg))
+    (inst srl x n-widetag-bits y)))
+(define-move-vop move-to-character :move
+  (any-reg descriptor-reg) (character-reg))
 
 ;;; Move an untagged char to a tagged representation.
-(define-vop (move-from-base-char)
-  (:args (x :scs (base-char-reg)))
+(define-vop (move-from-character)
+  (:args (x :scs (character-reg)))
   (:results (y :scs (any-reg descriptor-reg)))
   (:generator 1
-    (inst sll x sb!vm:type-bits y)
-    (inst bis y sb!vm:base-char-type y)))
-;;;
-(define-move-vop move-from-base-char :move
-  (base-char-reg) (any-reg descriptor-reg))
+    (inst sll x n-widetag-bits y)
+    (inst bis y character-widetag y)))
+(define-move-vop move-from-character :move
+  (character-reg) (any-reg descriptor-reg))
 
-;;; Move untagged base-char values.
-(define-vop (base-char-move)
+;;; Move untagged character values.
+(define-vop (character-move)
   (:args (x :target y
-	    :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))))
   (:effects)
   (:affected)
   (:generator 0
     (move x y)))
-;;;
-(define-move-vop base-char-move :move
-  (base-char-reg) (base-char-reg))
+(define-move-vop character-move :move
+  (character-reg) (character-reg))
 
-
-;;; Move untagged base-char arguments/return-values.
-(define-vop (move-base-char-argument)
+;;; Move untagged character arguments/return-values.
+(define-vop (move-character-arg)
   (:args (x :target y
-	    :scs (base-char-reg))
-	 (fp :scs (any-reg)
-	     :load-if (not (sc-is y base-char-reg))))
+            :scs (character-reg))
+         (fp :scs (any-reg)
+             :load-if (not (sc-is y character-reg))))
   (:results (y))
   (:generator 0
     (sc-case y
-      (base-char-reg
+      (character-reg
        (move x y))
-      (base-char-stack
+      (character-stack
        (storew x fp (tn-offset y))))))
-;;;
-(define-move-vop move-base-char-argument :move-argument
-  (any-reg base-char-reg) (base-char-reg))
-
+(define-move-vop move-character-arg :move-arg
+  (any-reg character-reg) (character-reg))
 
-;;; Use standard MOVE-ARGUMENT + coercion to move an untagged base-char
+;;; Use standard MOVE-ARG + coercion to move an untagged character
 ;;; to a descriptor passing location.
 ;;;
-(define-move-vop move-argument :move-argument
-  (base-char-reg) (any-reg descriptor-reg))
+(define-move-vop move-arg :move-arg
+  (character-reg) (any-reg descriptor-reg))
 
 ;;;; other operations
-
 (define-vop (char-code)
   (:translate char-code)
   (:policy :fast-safe)
-  (:args (ch :scs (base-char-reg) :target res))
-  (:arg-types base-char)
+  (:args (ch :scs (character-reg) :target res))
+  (:arg-types character)
   (:results (res :scs (any-reg)))
   (:result-types positive-fixnum)
   (:generator 1
-    (inst sll ch 2 res)))
+    (inst sll ch n-fixnum-tag-bits res)))
 
 (define-vop (code-char)
   (:translate code-char)
   (:policy :fast-safe)
   (:args (code :scs (any-reg) :target res))
   (:arg-types positive-fixnum)
-  (:results (res :scs (base-char-reg)))
-  (:result-types base-char)
+  (:results (res :scs (character-reg)))
+  (:result-types character)
   (:generator 1
-    (inst srl code 2 res)))
+    (inst srl code n-fixnum-tag-bits res)))
 
-;;;; comparison of BASE-CHARs
+;;;; comparison of CHARACTERs
 
-(define-vop (base-char-compare)
-  (:args (x :scs (base-char-reg))
-	 (y :scs (base-char-reg)))
-  (:arg-types base-char base-char)
+(define-vop (character-compare)
+  (:args (x :scs (character-reg))
+         (y :scs (character-reg)))
+  (:arg-types character character)
   (:temporary (:scs (non-descriptor-reg)) temp)
   (:conditional)
   (:info target not-p)
@@ -114,17 +107,51 @@
       (:lt (inst cmplt x y temp))
       (:gt (inst cmplt y x temp)))
     (if not-p
-	(inst beq temp target)
-	(inst bne temp target))))
+        (inst beq temp target)
+        (inst bne temp target))))
+
+(define-vop (fast-char=/character character-compare)
+  (:translate char=)
+  (:variant :eq))
+
+(define-vop (fast-char</character character-compare)
+  (:translate char<)
+  (:variant :lt))
+
+(define-vop (fast-char>/character character-compare)
+  (:translate char>)
+  (:variant :gt))
+
+(define-vop (character-compare/c)
+  (:args (x :scs (character-reg)))
+  (:arg-types character (:constant character))
+  (:temporary (:scs (non-descriptor-reg)) temp)
+  (:conditional)
+  (:info target not-p y)
+  (:policy :fast-safe)
+  (:note "inline constant comparison")
+  (:variant-vars cond)
+  (:generator 2
+    (ecase cond
+      (:eq (inst cmpeq x (sb!xc:char-code y) temp))
+      (:lt (inst cmplt x (sb!xc:char-code y) temp))
+      (:gt (inst cmple x (sb!xc:char-code y) temp)))
+    (if not-p
+        (if (eq cond :gt)
+            (inst bne temp target)
+            (inst beq temp target))
+        (if (eq cond :gt)
+            (inst beq temp target)
+            (inst bne temp target)))))
 
-(define-vop (fast-char=/base-char base-char-compare)
+(define-vop (fast-char=/character/c character-compare/c)
   (:translate char=)
   (:variant :eq))
 
-(define-vop (fast-char</base-char base-char-compare)
+(define-vop (fast-char</character/c character-compare/c)
   (:translate char<)
   (:variant :lt))
 
-(define-vop (fast-char>/base-char base-char-compare)
+(define-vop (fast-char>/character/c character-compare/c)
   (:translate char>)
   (:variant :gt))