X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fmips%2Fmove.lisp;h=ae0c33b835dd9a030d63f7319e6d1ce56cf07b76;hb=179812c3ad5dad69239c625ec929a7d486cf568f;hp=dcaae735aec7acc659e1e235f468333548edd053;hpb=52cfe54802db8736f1f4e2b67764c43bba9b78b3;p=sbcl.git

diff --git a/src/compiler/mips/move.lisp b/src/compiler/mips/move.lisp
index dcaae73..ae0c33b 100644
--- a/src/compiler/mips/move.lisp
+++ b/src/compiler/mips/move.lisp
@@ -141,7 +141,7 @@
   (:arg-types tagged-num)
   (:note "fixnum untagging")
   (:generator 1
-    (inst sra y x 2)))
+    (inst sra y x n-fixnum-tag-bits)))
 ;;;
 (define-move-vop move-to-word/fixnum :move
   (any-reg descriptor-reg) (signed-reg unsigned-reg))
@@ -152,7 +152,11 @@
   (:results (y :scs (signed-reg unsigned-reg)))
   (:note "constant load")
   (:generator 1
-    (inst li y (tn-value x))))
+    (cond ((sb!c::tn-leaf x)
+           (inst li y (tn-value x)))
+          (t
+           (loadw y code-tn (tn-offset x) other-pointer-lowtag)
+           (inst sra y y n-fixnum-tag-bits)))))
 ;;;
 (define-move-vop move-to-word-c :move
   (constant) (signed-reg unsigned-reg))
@@ -165,9 +169,9 @@
   (:temporary (:scs (non-descriptor-reg)) temp)
   (:generator 3
     (let ((done (gen-label)))
-      (inst and temp x 3)
+      (inst and temp x fixnum-tag-mask)
       (inst beq temp done)
-      (inst sra y x 2)
+      (inst sra y x n-fixnum-tag-bits)
 
       (loadw y x bignum-digits-offset other-pointer-lowtag)
       (emit-label done))))
@@ -185,7 +189,7 @@
   (:result-types tagged-num)
   (:note "fixnum tagging")
   (:generator 1
-    (inst sll y x 2)))
+    (inst sll y x n-fixnum-tag-bits)))
 ;;;
 (define-move-vop move-from-word/fixnum :move
   (signed-reg unsigned-reg) (any-reg descriptor-reg))
@@ -203,20 +207,20 @@
     (move x arg)
     (let ((fixnum (gen-label))
           (done (gen-label)))
-      (inst sra temp x 29)
+      (inst sra temp x n-positive-fixnum-bits)
       (inst beq temp fixnum)
       (inst nor temp zero-tn)
       (inst beq temp done)
-      (inst sll y x 2)
+      (inst sll y x n-fixnum-tag-bits)
 
       (with-fixed-allocation
-          (y pa-flag temp bignum-widetag (1+ bignum-digits-offset))
+          (y pa-flag temp bignum-widetag (1+ bignum-digits-offset) nil)
         (storew x y bignum-digits-offset other-pointer-lowtag))
       (inst b done)
       (inst nop)
 
       (emit-label fixnum)
-      (inst sll y x 2)
+      (inst sll y x n-fixnum-tag-bits)
       (emit-label done))))
 ;;;
 (define-move-vop move-from-signed :move
@@ -234,9 +238,9 @@
   (:note "unsigned word to integer coercion")
   (:generator 20
     (move x arg)
-    (inst srl temp x 29)
+    (inst srl temp x n-positive-fixnum-bits)
     (inst beq temp done)
-    (inst sll y x 2)
+    (inst sll y x n-fixnum-tag-bits)
 
     (pseudo-atomic
       (pa-flag :extra (pad-data-block (+ bignum-digits-offset 2)))