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

diff --git a/src/compiler/alpha/macros.lisp b/src/compiler/alpha/macros.lisp
index d472eef..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)))
@@ -224,8 +224,7 @@
   Emit code for a continuable error with the specified Error-Code and
   context Values.  If the error is continued, execution resumes after
   the GENERATE-CERROR-CODE form."
-  (let ((continue (gensym "CONTINUE-LABEL-"))
-	(error (gensym "ERROR-LABEL-")))
+  (with-unique-names (continue error)
     `(let ((,continue (gen-label)))
        (emit-label ,continue)
        (assemble (*elsewhere*)
@@ -380,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
@@ -473,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))