X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fmacros.lisp;h=a2515016fdba481deca0479c5fe4dff546ec4576;hb=a4c3562138e342465826de31fb8c324ae8a4b594;hp=283cf22954b2d87bae5c62504128286978a2cc19;hpb=b7eed59f1877263e1af5ad80299e641e8276f77d;p=sbcl.git

diff --git a/src/compiler/alpha/macros.lisp b/src/compiler/alpha/macros.lisp
index 283cf22..a251501 100644
--- a/src/compiler/alpha/macros.lisp
+++ b/src/compiler/alpha/macros.lisp
@@ -87,8 +87,8 @@
 (defmacro lisp-jump (function lip)
   "Jump to the lisp function FUNCTION.  LIP is an interior-reg temporary."
   `(progn
-     (inst lda ,lip (- (ash sb!vm:simple-fun-code-offset sb!vm:word-shift)
-		       sb!vm:fun-pointer-lowtag)
+     (inst lda ,lip (- (ash simple-fun-code-offset word-shift)
+		       fun-pointer-lowtag)
 	    ,function)
      (move ,function code-tn)
      (inst jsr zero-tn ,lip 1)))
@@ -379,7 +379,7 @@
 	 (:result-types ,el-type)
 	 (:temporary (:sc non-descriptor-reg) temp)
 	 (:temporary (:sc non-descriptor-reg) temp1)
-	 (:generator 5
+	 (:generator 4
 	   ,@(ecase size
 	       (:byte
 		(if signed
@@ -472,32 +472,38 @@
 	 (:temporary (:sc non-descriptor-reg) temp2)
 	 (:results (result :scs ,scs))
 	 (:result-types ,el-type)
-	 (:generator 5
+	 (:generator 4
 	   ,@(ecase size
 	       (:byte
-		`((inst lda temp (- (* ,offset n-word-bytes)
-				    (* index ,scale) ,lowtag)
+		`((inst lda temp (- (+ (* ,offset n-word-bytes)
+				       (* index ,scale))
+				    ,lowtag)
 			object)
-		  (inst ldq_u temp1 (- (* ,offset n-word-bytes) 
-				       (* index ,scale) ,lowtag)
+		  (inst ldq_u temp1 (- (+ (* ,offset n-word-bytes) 
+					  (* index ,scale))
+				       ,lowtag)
 			object)
 		  (inst insbl value temp temp2)
 		  (inst mskbl temp1 temp temp1)
 		  (inst bis temp1 temp2 temp1)
-		  (inst stq_u temp1 (- (* ,offset n-word-bytes)
-				       (* index ,scale) ,lowtag) object)))
+		  (inst stq_u temp1 (- (+ (* ,offset n-word-bytes)
+					  (* index ,scale))
+				       ,lowtag) object)))
 	       (:short
-		`((inst lda temp (- (* ,offset n-word-bytes)
-				    (* index ,scale) ,lowtag)
+		`((inst lda temp (- (+ (* ,offset n-word-bytes)
+				       (* index ,scale))
+				    ,lowtag)
 			object)
-		  (inst ldq_u temp1 (- (* ,offset n-word-bytes)
-				       (* index ,scale) ,lowtag)
+		  (inst ldq_u temp1 (- (+ (* ,offset n-word-bytes)
+					  (* index ,scale))
+				       ,lowtag)
 			object)
 		  (inst mskwl temp1 temp temp1)
 		  (inst inswl value temp temp2)
 		  (inst bis temp1 temp2 temp)
-		  (inst stq_u temp (- (* ,offset n-word-bytes)
-				      (* index ,scale) ,lowtag) object))))
+		  (inst stq_u temp (- (+ (* ,offset n-word-bytes)
+					 (* index ,scale))
+				      ,lowtag) object))))
 	   (move value result))))))
 
 (defmacro sb!sys::with-pinned-objects ((&rest objects) &body body)