X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fhppa%2Fchar.lisp;h=06b59dd19a561dd2fa439d9d401badc1864c4e83;hb=9c510b74eca61bbcc2014dc2b1d02049dff50508;hp=469d8963012ebc7369af91880b5370e7fca4e0c1;hpb=8a19c6876412b8ad1cf729297c2a373d63a0d0ec;p=sbcl.git

diff --git a/src/compiler/hppa/char.lisp b/src/compiler/hppa/char.lisp
index 469d896..06b59dd 100644
--- a/src/compiler/hppa/char.lisp
+++ b/src/compiler/hppa/char.lisp
@@ -1,104 +1,102 @@
-(in-package "SB!VM")
+;;;; the HPPA VM definition of character operations
+
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
 
+(in-package "SB!VM")
 
 ;;;; Moves and coercions:
 
 ;;; Move a tagged char to an untagged representation.
-;;;
-(define-vop (move-to-base-char)
+(define-vop (move-to-character)
+  (:note "character untagging")
   (:args (x :scs (any-reg descriptor-reg)))
-  (:results (y :scs (base-char-reg)))
+  (:results (y :scs (character-reg)))
   (:generator 1
     (inst srl x n-widetag-bits y)))
-;;;
-(define-move-vop move-to-base-char :move
-  (any-reg descriptor-reg) (base-char-reg))
+(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)
+  (:note "character tagging")
+  (:args (x :scs (character-reg)))
   (:results (y :scs (any-reg descriptor-reg)))
   (:generator 1
     (inst sll x n-widetag-bits y)
-    (inst addi base-char-widetag y y)))
-;;;
-(define-move-vop move-from-base-char :move
-  (base-char-reg) (any-reg descriptor-reg))
+    (inst addi character-widetag y 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)
+  (:note "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 args/return-values.
+(define-vop (move-character-arg)
+  (:note "character arg move")
   (: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-arg
-  (any-reg base-char-reg) (base-char-reg))
-
-
-;;; Use standard MOVE-ARGUMENT + coercion to move an untagged base-char
-;;; to a descriptor passing location.
-;;;
-(define-move-vop move-argument :move-arg
-  (base-char-reg) (any-reg descriptor-reg))
-
+(define-move-vop move-character-arg :move-arg
+  (any-reg character-reg) (character-reg))
 
+;;; Use standard MOVE-ARG + coercion to move an untagged character to
+;;; a descriptor passing location.
+(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)
-  (:results (res :scs (unsigned-reg)))
+  (:args (ch :scs (character-reg) :target res))
+  (:arg-types character)
+  (:results (res :scs (any-reg)))
   (:result-types positive-fixnum)
   (:generator 1
-    (move ch res)))
+    (inst sll ch 2 res)))
 
 (define-vop (code-char)
   (:translate code-char)
   (:policy :fast-safe)
-  (:args (code :scs (unsigned-reg) :target res))
+  (: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
-    (move code res)))
-
+    (inst srl code 2 res)))
 
-;;; 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)
   (:conditional)
   (:info target not-p)
   (:policy :fast-safe)
@@ -107,14 +105,15 @@
   (:generator 3
     (inst bc cond not-p x y target)))
 
-(define-vop (fast-char=/base-char base-char-compare)
+(define-vop (fast-char=/character character-compare)
   (:translate char=)
   (:variant :=))
 
-(define-vop (fast-char</base-char base-char-compare)
+(define-vop (fast-char</character character-compare)
   (:translate char<)
   (:variant :<<))
 
-(define-vop (fast-char>/base-char base-char-compare)
+(define-vop (fast-char>/character character-compare)
   (:translate char>)
   (:variant :>>))
+