1.0.23.50: Less magic constants in the MIPS backend.

diff --git a/src/compiler/mips/cell.lisp b/src/compiler/mips/cell.lisp
index 4bab30f..21427d3 100644 (file)
--- a/src/compiler/mips/cell.lisp
+++ b/src/compiler/mips/cell.lisp
@@ -294,7 +294,7 @@
   (:generator 5
     (loadw offset object 0 instance-pointer-lowtag)
     (inst srl offset n-widetag-bits)
-    (inst sll offset 2)
+    (inst sll offset n-fixnum-tag-bits)
     (inst subu offset index)
     (inst subu offset n-word-bytes)
     (inst addu lip offset object)
@@ -315,7 +315,7 @@
   (:generator 5
     (loadw offset object 0 instance-pointer-lowtag)
     (inst srl offset n-widetag-bits)
-    (inst sll offset 2)
+    (inst sll offset n-fixnum-tag-bits)
     (inst subu offset index)
     (inst subu offset n-word-bytes)
     (inst addu lip offset object)
@@ -336,7 +336,7 @@
   (:generator 5
     (loadw offset object 0 instance-pointer-lowtag)
     (inst srl offset n-widetag-bits)
-    (inst sll offset 2)
+    (inst sll offset n-fixnum-tag-bits)
     (inst subu offset index)
     (inst subu offset n-word-bytes)
     (inst addu lip offset object)
@@ -357,7 +357,7 @@
   (:generator 5
     (loadw offset object 0 instance-pointer-lowtag)
     (inst srl offset n-widetag-bits)
-    (inst sll offset 2)
+    (inst sll offset n-fixnum-tag-bits)
     (inst subu offset index)
     (inst subu offset n-word-bytes)
     (inst addu lip offset object)
@@ -379,7 +379,7 @@
   (:generator 5
     (loadw offset object 0 instance-pointer-lowtag)
     (inst srl offset n-widetag-bits)
-    (inst sll offset 2)
+    (inst sll offset n-fixnum-tag-bits)
     (inst subu offset index)
     (inst subu offset (* 2 n-word-bytes))
     (inst addu lip offset object)
@@ -408,7 +408,7 @@
   (:generator 5
     (loadw offset object 0 instance-pointer-lowtag)
     (inst srl offset n-widetag-bits)
-    (inst sll offset 2)
+    (inst sll offset n-fixnum-tag-bits)
     (inst subu offset index)
     (inst subu offset (* 2 n-word-bytes))
     (inst addu lip offset object)
@@ -438,7 +438,7 @@
   (:generator 5
     (loadw offset object 0 instance-pointer-lowtag)
     (inst srl offset n-widetag-bits)
-    (inst sll offset 2)
+    (inst sll offset n-fixnum-tag-bits)
     (inst subu offset index)
     (inst subu offset (* 2 n-word-bytes))
     (inst addu lip offset object)
@@ -467,7 +467,7 @@
   (:generator 5
     (loadw offset object 0 instance-pointer-lowtag)
     (inst srl offset n-widetag-bits)
-    (inst sll offset 2)
+    (inst sll offset n-fixnum-tag-bits)
     (inst subu offset index)
     (inst subu offset (* 2 n-word-bytes))
     (inst addu lip offset object)
@@ -503,7 +503,7 @@
   (:generator 5
     (loadw offset object 0 instance-pointer-lowtag)
     (inst srl offset n-widetag-bits)
-    (inst sll offset 2)
+    (inst sll offset n-fixnum-tag-bits)
     (inst subu offset index)
     (inst subu offset (* 4 n-word-bytes))
     (inst addu lip offset object)
@@ -566,7 +566,7 @@
   (:generator 5
     (loadw offset object 0 instance-pointer-lowtag)
     (inst srl offset n-widetag-bits)
-    (inst sll offset 2)
+    (inst sll offset n-fixnum-tag-bits)
     (inst subu offset index)
     (inst subu offset (* 4 n-word-bytes))
     (inst addu lip offset object)

diff --git a/version.lisp-expr b/version.lisp-expr
index 68c49f7..c58198d 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.23.49"
+"1.0.23.50"