X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Falpha%2Fassem-rtns.lisp;h=7fedab450cbe65ec505252d45dc0423e1dd946e1;hb=37b1ed8e9b6faa84832b8251998b5d0eb1f6b307;hp=c005c0fa69a90f30f848b470e338a76e3ba47534;hpb=aa2dc9529460ea0d9c99998dc87283fc1a43e808;p=sbcl.git

diff --git a/src/assembly/alpha/assem-rtns.lisp b/src/assembly/alpha/assem-rtns.lisp
index c005c0f..7fedab4 100644
--- a/src/assembly/alpha/assem-rtns.lisp
+++ b/src/assembly/alpha/assem-rtns.lisp
@@ -36,38 +36,38 @@
      (:temp a4 descriptor-reg a4-offset)
      (:temp a5 descriptor-reg a5-offset))
 
-  ;; Note, because of the way the return-multiple vop is written, we can
-  ;; assume that we are never called with nvals == 1 and that a0 has already
-  ;; been loaded.
+  ;; Note, because of the way the RETURN-MULTIPLE VOP is written, we
+  ;; can assume that we are never called with NVALS == 1 and that A0
+  ;; has already been loaded.
   (inst ble nvals default-a0-and-on)
-  (inst ldl a1 (* 1 word-bytes) vals)
+  (inst ldl a1 (* 1 n-word-bytes) vals)
   (inst subq nvals (fixnumize 2) count)
   (inst ble count default-a2-and-on)
-  (inst ldl a2 (* 2 word-bytes) vals)
+  (inst ldl a2 (* 2 n-word-bytes) vals)
   (inst subq nvals (fixnumize 3) count)
   (inst ble count default-a3-and-on)
-  (inst ldl a3 (* 3 word-bytes) vals)
+  (inst ldl a3 (* 3 n-word-bytes) vals)
   (inst subq nvals (fixnumize 4) count)
   (inst ble count default-a4-and-on)
-  (inst ldl a4 (* 4 word-bytes) vals)
+  (inst ldl a4 (* 4 n-word-bytes) vals)
   (inst subq nvals (fixnumize 5) count)
   (inst ble count default-a5-and-on)
-  (inst ldl a5 (* 5 word-bytes) vals)
+  (inst ldl a5 (* 5 n-word-bytes) vals)
   (inst subq nvals (fixnumize 6) count)
   (inst ble count done)
 
   ;; Copy the remaining args to the top of the stack.
-  (inst addq vals (* 6 word-bytes) vals)
-  (inst addq cfp-tn (* 6 word-bytes) dst)
+  (inst addq vals (* 6 n-word-bytes) vals)
+  (inst addq cfp-tn (* 6 n-word-bytes) dst)
 
   LOOP
   (inst ldl temp 0 vals)
-  (inst addq vals word-bytes vals)
+  (inst addq vals n-word-bytes vals)
   (inst stl temp 0 dst)
   (inst subq count (fixnumize 1) count)
-  (inst addq dst word-bytes dst)
+  (inst addq dst n-word-bytes dst)
   (inst bne count loop)
-		
+
   (inst br zero-tn done)
 
   DEFAULT-A0-AND-ON
@@ -82,12 +82,12 @@
   DEFAULT-A5-AND-ON
   (inst move null-tn a5)
   DONE
-  
+
   ;; Clear the stack.
   (move cfp-tn ocfp-tn)
   (move ocfp cfp-tn)
   (inst addq ocfp-tn nvals csp-tn)
-  
+
   ;; Return.
   (lisp-return lra lip))
 
@@ -125,35 +125,35 @@
 
   ;; Calculate NARGS (as a fixnum)
   (inst subq csp-tn args nargs)
-     
+
   ;; Load the argument regs (must do this now, 'cause the blt might
   ;; trash these locations)
-  (inst ldl a0 (* 0 word-bytes) args)
-  (inst ldl a1 (* 1 word-bytes) args)
-  (inst ldl a2 (* 2 word-bytes) args)
-  (inst ldl a3 (* 3 word-bytes) args)
-  (inst ldl a4 (* 4 word-bytes) args)
-  (inst ldl a5 (* 5 word-bytes) args)
+  (inst ldl a0 (* 0 n-word-bytes) args)
+  (inst ldl a1 (* 1 n-word-bytes) args)
+  (inst ldl a2 (* 2 n-word-bytes) args)
+  (inst ldl a3 (* 3 n-word-bytes) args)
+  (inst ldl a4 (* 4 n-word-bytes) args)
+  (inst ldl a5 (* 5 n-word-bytes) args)
 
   ;; Calc SRC, DST, and COUNT
   (inst subq nargs (fixnumize register-arg-count) count)
-  (inst addq args (* word-bytes register-arg-count) src)
+  (inst addq args (* n-word-bytes register-arg-count) src)
   (inst ble count done)
-  (inst addq cfp-tn (* word-bytes register-arg-count) dst)
-	
+  (inst addq cfp-tn (* n-word-bytes register-arg-count) dst)
+
   LOOP
   ;; Copy one arg.
   (inst ldl temp 0 src)
-  (inst addq src word-bytes src)
+  (inst addq src n-word-bytes src)
   (inst stl temp 0 dst)
   (inst subq count (fixnumize 1) count)
-  (inst addq dst word-bytes dst)
+  (inst addq dst n-word-bytes dst)
   (inst bgt count loop)
-	
+
   DONE
   ;; We are done.  Do the jump.
   (progn
-    (loadw temp lexenv closure-function-slot function-pointer-type)
+    (loadw temp lexenv closure-fun-slot fun-pointer-lowtag)
     (lisp-jump temp lip)))
 
 
@@ -177,15 +177,15 @@
   (load-symbol-value cur-uwp *current-unwind-protect-block*)
   (let ((error (generate-error-code nil invalid-unwind-error)))
     (inst beq block error))
-  
+
   (loadw target-uwp block unwind-block-current-uwp-slot)
   (inst cmpeq cur-uwp target-uwp temp1)
   (inst beq temp1 do-uwp)
-      
+
   (move block cur-uwp)
 
   do-exit
-      
+
   (loadw cfp-tn cur-uwp unwind-block-current-cont-slot)
   (loadw code-tn cur-uwp unwind-block-current-code-slot)
   (progn
@@ -206,24 +206,24 @@
      (:temp catch any-reg a1-offset)
      (:temp tag descriptor-reg a2-offset)
      (:temp temp1 non-descriptor-reg nl0-offset))
-  
+
   (progn start count) ; We just need them in the registers.
 
   (load-symbol-value catch *current-catch-block*)
-  
+
   loop
-  
+
   (let ((error (generate-error-code nil unseen-throw-tag-error target)))
     (inst beq catch error))
-  
+
   (loadw tag catch catch-block-tag-slot)
   (inst cmpeq tag target temp1)
   (inst bne temp1 exit)
   (loadw catch catch catch-block-previous-catch-slot)
   (inst br zero-tn loop)
-  
+
   exit
-  
+
   (move catch target)
   (inst li (make-fixup 'unwind :assembly-routine) temp1)
   (inst jmp zero-tn temp1 (make-fixup 'unwind :assembly-routine)))