X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fmacros.lisp;h=998cec09eae95d8c006da9b4b6742bb8ef761eab;hb=305177dc7a7d11245e42e003ac4070eb1705c699;hp=958e05a11a179c66596b74dce3567207e813ece5;hpb=90ca09b75fbc3b63b2f7d09c67b04b866dd783f6;p=sbcl.git

diff --git a/src/compiler/alpha/macros.lisp b/src/compiler/alpha/macros.lisp
index 958e05a..998cec0 100644
--- a/src/compiler/alpha/macros.lisp
+++ b/src/compiler/alpha/macros.lisp
@@ -185,6 +185,7 @@
 			       :element-type '(unsigned-byte 8)
 			       :fill-pointer 0
 			       :adjustable t))))
+     (declare (type (vector (unsigned-byte 8) 16) ,var))
      (setf (fill-pointer ,var) 0)
      (unwind-protect
 	 (progn
@@ -200,12 +201,12 @@
 	(inst gentrap ,kind)
 	(with-adjustable-vector (,vector)
 	  (write-var-integer (error-number-or-lose ',code) ,vector)
-	  ,@(mapcar #'(lambda (tn)
-			`(let ((tn ,tn))
-			   (write-var-integer (make-sc-offset (sc-number
-							       (tn-sc tn))
-							      (tn-offset tn))
-					      ,vector)))
+	  ,@(mapcar (lambda (tn)
+		      `(let ((tn ,tn))
+			 (write-var-integer (make-sc-offset (sc-number
+							     (tn-sc tn))
+							    (tn-offset tn))
+					    ,vector)))
 		    values)
 	  (inst byte (length ,vector))
 	  (dotimes (i (length ,vector))
@@ -250,28 +251,15 @@
 	   ,error)))))
 
 
-;;; PSEUDO-ATOMIC -- Handy macro for making sequences look atomic.
-;;;
+;;; a handy macro for making sequences look atomic
 (defmacro pseudo-atomic ((&key (extra 0)) &rest forms)
   `(progn
      (inst addq alloc-tn 1 alloc-tn)
      ,@forms
      (inst lda alloc-tn (1- ,extra) alloc-tn)
      (inst stl zero-tn 0 alloc-tn)))
-
-
 
-;;;; Memory accessor vop generators
-
-(deftype load/store-index (scale lowtag min-offset
-				 &optional (max-offset min-offset))
-  `(integer ,(- (truncate (+ (ash 1 16)
-			     (* min-offset n-word-bytes)
-			     (- lowtag))
-			  scale))
-	    ,(truncate (- (+ (1- (ash 1 16)) lowtag)
-			  (* max-offset n-word-bytes))
-		       scale)))
+;;;; memory accessor vop generators
 
 (defmacro define-full-reffer (name type offset lowtag scs el-type
 				   &optional translate)
@@ -309,7 +297,7 @@
 	     '((inst mskll value 4 value)))))))
 
 (defmacro define-full-setter (name type offset lowtag scs el-type
-				   &optional translate #+gengc (remember t))
+				   &optional translate #!+gengc (remember t))
   `(progn
      (define-vop (,name)
        ,@(when translate