X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fmacros.lisp;h=790d69e33d45098001555e9f5ab60a77e312166a;hb=f8893c7c658bf9d9e0757c63e47af2fdea810f04;hp=130b2306b8dbf6faf5c1b8d81d87edee7b755d3e;hpb=670010e3f3dcd62efaf23f61abdc73950edb88c6;p=sbcl.git

diff --git a/src/compiler/alpha/macros.lisp b/src/compiler/alpha/macros.lisp
index 130b230..790d69e 100644
--- a/src/compiler/alpha/macros.lisp
+++ b/src/compiler/alpha/macros.lisp
@@ -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,30 +472,45 @@
 	 (: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)
+  "Arrange with the garbage collector that the pages occupied by
+OBJECTS will not be moved in memory for the duration of BODY.
+Useful for e.g. foreign calls where another thread may trigger
+garbage collection.  This is currently implemented by disabling GC"
+  (declare (ignore objects))		;should we eval these for side-effect?
+  `(without-gcing
+    ,@body))