;;;; files for more information.
(in-package "SB!VM")
-
-(file-comment
- "$Header$")
\f
;;;; RETURN-MULTIPLE
;; 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)
(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)
;; Handle the register arg cases.
ZERO-VALUES
(move esp-tn ebx)
- (inst mov edx *nil-value*)
+ (inst mov edx nil-value)
(inst mov edi edx)
(inst mov esi edx)
(inst jmp eax)
TWO-VALUES
(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 mov esi nil-value)
+ (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))
\f
;;;; 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
(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)
(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)
;; 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
;; 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))))
\f
(define-assembly-routine (throw
(:return-style :none))
(declare (ignore start count))
- (load-symbol-value catch sb!impl::*current-catch-block*)
+ (load-symbol-value catch *current-catch-block*)
LOOP
(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
;; 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
;; 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))))
projects / sbcl.git / blobdiff