X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fsparc%2Fmove.lisp;h=1217994cb4a4ab606729c7eed8119f8898f2abdc;hb=b63c4fb9b98fa8188e17ba926e150ba417a74635;hp=f3b75665cca39cd08cb27fca740ce0be36343ae6;hpb=68fd2d2dd6f265669a8957accd8a33e62786a97e;p=sbcl.git

diff --git a/src/compiler/sparc/move.lisp b/src/compiler/sparc/move.lisp
index f3b7566..1217994 100644
--- a/src/compiler/sparc/move.lisp
+++ b/src/compiler/sparc/move.lisp
@@ -24,15 +24,15 @@
        (load-symbol y val))
       (character
        (inst li y (logior (ash (char-code val) n-widetag-bits)
-			  base-char-widetag))))))
+			  character-widetag))))))
 
 (define-move-fun (load-number 1) (vop x y)
   ((immediate zero)
    (signed-reg unsigned-reg))
   (inst li y (tn-value x)))
 
-(define-move-fun (load-base-char 1) (vop x y)
-  ((immediate) (base-char-reg))
+(define-move-fun (load-character 1) (vop x y)
+  ((immediate) (character-reg))
   (inst li y (char-code (tn-value x))))
 
 (define-move-fun (load-system-area-pointer 1) (vop x y)
@@ -48,7 +48,7 @@
   (load-stack-tn y x))
 
 (define-move-fun (load-number-stack 5) (vop x y)
-  ((base-char-stack) (base-char-reg)
+  ((character-stack) (character-reg)
    (sap-stack) (sap-reg)
    (signed-stack) (signed-reg)
    (unsigned-stack) (unsigned-reg))
@@ -60,7 +60,7 @@
   (store-stack-tn y x))
 
 (define-move-fun (store-number-stack 5) (vop x y)
-  ((base-char-reg) (base-char-stack)
+  ((character-reg) (character-stack)
    (sap-reg) (sap-stack)
    (signed-reg) (signed-stack)
    (unsigned-reg) (unsigned-stack))
@@ -139,7 +139,7 @@
   (:arg-types tagged-num)
   (:note "fixnum untagging")
   (:generator 1
-    (inst sra y x fixnum-tag-bits)))
+    (inst sra y x n-fixnum-tag-bits)))
 
 (define-move-vop move-to-word/fixnum :move
   (any-reg descriptor-reg) (signed-reg unsigned-reg))
@@ -166,7 +166,7 @@
     (let ((done (gen-label)))
       (inst andcc temp x fixnum-tag-mask)
       (inst b :eq done)
-      (inst sra y x fixnum-tag-bits)
+      (inst sra y x n-fixnum-tag-bits)
       
       (loadw y x bignum-digits-offset other-pointer-lowtag)
       
@@ -183,7 +183,7 @@
   (:result-types tagged-num)
   (:note "fixnum tagging")
   (:generator 1
-    (inst sll y x fixnum-tag-bits)))
+    (inst sll y x n-fixnum-tag-bits)))
 
 (define-move-vop move-from-word/fixnum :move
   (signed-reg unsigned-reg) (any-reg descriptor-reg))
@@ -200,12 +200,12 @@
     (move x arg)
     (let ((fixnum (gen-label))
 	  (done (gen-label)))
-      (inst sra temp x positive-fixnum-bits)
+      (inst sra temp x n-positive-fixnum-bits)
       (inst cmp temp)
       (inst b :eq fixnum)
       (inst orncc temp zero-tn temp)
       (inst b :eq done)
-      (inst sll y x fixnum-tag-bits)
+      (inst sll y x n-fixnum-tag-bits)
       
       (with-fixed-allocation
 	(y temp bignum-widetag (1+ bignum-digits-offset))
@@ -214,7 +214,7 @@
       (inst nop)
       
       (emit-label fixnum)
-      (inst sll y x fixnum-tag-bits)
+      (inst sll y x n-fixnum-tag-bits)
       (emit-label done))))
 
 (define-move-vop move-from-signed :move
@@ -232,12 +232,11 @@
   (:generator 20
     (move x arg)
     (let ((done (gen-label))
-	  (one-word (gen-label))
-	  (initial-alloc (pad-data-block (1+ bignum-digits-offset))))
-      (inst sra temp x positive-fixnum-bits)
+	  (one-word (gen-label)))
+      (inst sra temp x n-positive-fixnum-bits)
       (inst cmp temp)
       (inst b :eq done)
-      (inst sll y x fixnum-tag-bits)
+      (inst sll y x n-fixnum-tag-bits)
 
       ;; We always allocate 2 words even if we don't need it.  (The
       ;; copying GC will take care of freeing the unused extra word.)