X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fx86%2Fassem-rtns.lisp;h=867b2d9ef674b8899194d313362e7d9093f20b1e;hb=50305b602c3953440af716137a56f50cd204375d;hp=3784517e1b7dfa0346ca7e6de9ae0c12cb6af2a6;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git

diff --git a/src/assembly/x86/assem-rtns.lisp b/src/assembly/x86/assem-rtns.lisp
index 3784517..867b2d9 100644
--- a/src/assembly/x86/assem-rtns.lisp
+++ b/src/assembly/x86/assem-rtns.lisp
@@ -42,15 +42,16 @@
   ;; Save the count, because the loop is going to destroy it.
   (inst mov edx ecx)
 
-  ;; Blit the values down the stack. Note: there might be overlap, so we have
-  ;; to be careful not to clobber values before we've read them. Because the
-  ;; stack builds down, we are coping to a larger address. Therefore, we need
-  ;; to iterate from larger addresses to smaller addresses.
-  ;; pfw-this says copy ecx words from esi to edi counting down.
+  ;; Blit the values down the stack. Note: there might be overlap, so
+  ;; we have to be careful not to clobber values before we've read
+  ;; them. Because the stack builds down, we are coping to a larger
+  ;; address. Therefore, we need to iterate from larger addresses to
+  ;; smaller addresses. pfw-this says copy ecx words from esi to edi
+  ;; counting down.
   (inst shr ecx 2)			; fixnum to raw word count
   (inst std)				; count down
   (inst sub esi 4)			; ?
-  (inst lea edi (make-ea :dword :base ebx :disp (- word-bytes)))
+  (inst lea edi (make-ea :dword :base ebx :disp (- n-word-bytes)))
   (inst rep)
   (inst movs :dword)
 
@@ -58,7 +59,7 @@
   (inst mov ecx edx)
 
   ;; Set the stack top to the last result.
-  (inst lea esp-tn (make-ea :dword :base edi :disp word-bytes))
+  (inst lea esp-tn (make-ea :dword :base edi :disp n-word-bytes))
 
   ;; Load the register args.
   (loadw edx ebx -1)
@@ -87,21 +88,21 @@
   (loadw edx esi -1)
   (loadw edi esi -2)
   (inst mov esi nil-value)
-  (inst lea esp-tn (make-ea :dword :base ebx :disp (* -2 word-bytes)))
+  (inst lea esp-tn (make-ea :dword :base ebx :disp (* -2 n-word-bytes)))
   (inst jmp eax)
 
   THREE-VALUES
   (loadw edx esi -1)
   (loadw edi esi -2)
   (loadw esi esi -3)
-  (inst lea esp-tn (make-ea :dword :base ebx :disp (* -3 word-bytes)))
+  (inst lea esp-tn (make-ea :dword :base ebx :disp (* -3 n-word-bytes)))
   (inst jmp eax))
 
 ;;;; TAIL-CALL-VARIABLE
 
-;;; For tail-call-variable, we have to copy the arguments from the end of our
-;;; stack frame (were args are produced) to the start of our stack frame
-;;; (were args are expected).
+;;; For tail-call-variable, we have to copy the arguments from the end
+;;; of our stack frame (were args are produced) to the start of our
+;;; stack frame (were args are expected).
 ;;;
 ;;; We take the function to call in EAX and a pointer to the arguments in
 ;;; ESI. EBP says the same over the jump, and the old frame pointer is
@@ -136,11 +137,12 @@
   (loadw ebx ebp-tn -2)
   (inst push ecx)
 
-  ;; Do the blit. Because we are coping from smaller addresses to larger
-  ;; addresses, we have to start at the largest pair and work our way down.
+  ;; Do the blit. Because we are coping from smaller addresses to
+  ;; larger addresses, we have to start at the largest pair and work
+  ;; our way down.
   (inst shr ecx 2)			; fixnum to raw words
   (inst std)				; count down
-  (inst lea edi (make-ea :dword :base ebp-tn :disp (- word-bytes)))
+  (inst lea edi (make-ea :dword :base ebp-tn :disp (- n-word-bytes)))
   (inst sub esi (fixnumize 1))
   (inst rep)
   (inst movs :dword)
@@ -153,7 +155,7 @@
   (popw ebp-tn -1)			; overwrites a0
 
   ;; Blow off the stack above the arguments.
-  (inst lea esp-tn (make-ea :dword :base edi :disp word-bytes))
+  (inst lea esp-tn (make-ea :dword :base edi :disp n-word-bytes))
 
   ;; remaining register args
   (loadw edi ebp-tn -2)
@@ -165,8 +167,8 @@
   ;; And jump into the function.
     (inst jmp
 	  (make-ea :byte :base eax
-		   :disp (- (* closure-function-slot word-bytes)
-			    function-pointer-type)))
+		   :disp (- (* closure-fun-slot n-word-bytes)
+			    fun-pointer-lowtag)))
 
   ;; All the arguments fit in registers, so load them.
   REGISTER-ARGS
@@ -176,15 +178,15 @@
 
   ;; Clear most of the stack.
   (inst lea esp-tn
-	(make-ea :dword :base ebp-tn :disp (* -3 word-bytes)))
+	(make-ea :dword :base ebp-tn :disp (* -3 n-word-bytes)))
 
   ;; Push the return-pc so it looks like we just called.
   (pushw ebp-tn -2)
 
   ;; And away we go.
   (inst jmp (make-ea :byte :base eax
-		     :disp (- (* closure-function-slot word-bytes)
-			      function-pointer-type))))
+		     :disp (- (* closure-fun-slot n-word-bytes)
+			      fun-pointer-lowtag))))
 
 (define-assembly-routine (throw
 			  (:return-style :none))
@@ -195,7 +197,7 @@
 
   (declare (ignore start count))
 
-  (load-symbol-value catch sb!impl::*current-catch-block*)
+  (load-symbol-value catch *current-catch-block*)
 
   LOOP
 
@@ -230,7 +232,7 @@
     (inst or block block)		; check for NULL pointer
     (inst jmp :z error))
 
-  (load-symbol-value uwp sb!impl::*current-unwind-protect-block*)
+  (load-symbol-value uwp *current-unwind-protect-block*)
 
   ;; Does *cuwpb* match value stored in argument cuwp slot?
   (inst cmp uwp
@@ -238,13 +240,13 @@
   ;; If a match, return to context in arg block.
   (inst jmp :e do-exit)
 
-  ;; Not a match - return to *current-unwind-protect-block* context.
+  ;; Not a match - return to *CURRENT-UNWIND-PROTECT-BLOCK* context.
   ;; Important! Must save (and return) the arg 'block' for later use!!
   (move edx-tn block)
   (move block uwp)
   ;; Set next unwind protect context.
   (loadw uwp uwp unwind-block-current-uwp-slot)
-  (store-symbol-value uwp sb!impl::*current-unwind-protect-block*)
+  (store-symbol-value uwp *current-unwind-protect-block*)
 
   DO-EXIT
 
@@ -255,4 +257,4 @@
   ;; count in ecx-tn
 
   (inst jmp (make-ea :byte :base block
-		     :disp (* unwind-block-entry-pc-slot word-bytes))))
+		     :disp (* unwind-block-entry-pc-slot n-word-bytes))))