#+sb-assembling ;; We don't want a vop for this one.
(define-assembly-routine
(return-multiple (:return-style :none))
- (;; These four are really arguments.
- (:temp eax unsigned-reg rax-offset)
- (:temp ebx unsigned-reg rbx-offset)
+ (;; These are really arguments.
(:temp ecx unsigned-reg rcx-offset)
(:temp esi unsigned-reg rsi-offset)
;; These we need as temporaries.
+ (:temp eax unsigned-reg rax-offset)
+ (:temp ebx unsigned-reg rbx-offset)
(:temp edx unsigned-reg rdx-offset)
(:temp edi unsigned-reg rdi-offset))
;; Pick off the cases where everything fits in register args.
- (inst jecxz zero-values)
+ (inst jrcxz ZERO-VALUES)
(inst cmp ecx (fixnumize 1))
- (inst jmp :e one-value)
+ (inst jmp :e ONE-VALUE)
(inst cmp ecx (fixnumize 2))
- (inst jmp :e two-values)
+ (inst jmp :e TWO-VALUES)
(inst cmp ecx (fixnumize 3))
- (inst jmp :e three-values)
+ (inst jmp :e THREE-VALUES)
- ;; Save the count, because the loop is going to destroy it.
- (inst mov edx ecx)
+ ;; As per the calling convention EBX is expected to point at the SP
+ ;; before the stack frame.
+ (inst lea ebx (make-ea :qword :base rbp-tn
+ :disp (* sp->fp-offset n-word-bytes)))
+ ;; Save the count, the return address and restore the frame pointer,
+ ;; because the loop is going to destroy them.
+ (inst mov edx ecx)
+ (inst mov eax (make-ea :qword :base rbp-tn
+ :disp (frame-byte-offset return-pc-save-offset)))
+ (inst mov rbp-tn (make-ea :qword :base rbp-tn
+ :disp (frame-byte-offset ocfp-save-offset)))
;; 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
+ ;; them. Because the stack builds down, we are copying 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 3) ; fixnum to raw word count
- (inst std) ; count down
- (inst sub esi 8) ; ?
+ (inst shr ecx (1- n-lowtag-bits))
+ (inst std) ; count down
+ (inst sub esi n-word-bytes)
(inst lea edi (make-ea :qword :base ebx :disp (- n-word-bytes)))
(inst rep)
(inst movs :qword)
+ (inst cld)
;; Restore the count.
(inst mov ecx edx)
(loadw esi ebx -3)
;; And back we go.
- (inst jmp eax)
+ (inst stc)
+ (inst push eax)
+ (inst ret)
;; Handle the register arg cases.
ZERO-VALUES
- (move rsp-tn ebx)
+ (inst lea ebx (make-ea :qword :base rbp-tn
+ :disp (* sp->fp-offset n-word-bytes)))
(inst mov edx nil-value)
(inst mov edi edx)
(inst mov esi edx)
- (inst jmp eax)
-
- ONE-VALUE ; Note: we can get this, because the return-multiple vop
- ; doesn't check for this case when size > speed.
+ (inst mov rsp-tn rbp-tn)
+ (inst stc)
+ (inst pop rbp-tn)
+ (inst ret)
+
+ ;; Note: we can get this, because the return-multiple vop doesn't
+ ;; check for this case when size > speed.
+ ONE-VALUE
(loadw edx esi -1)
- (inst mov rsp-tn ebx)
- (inst add eax 3)
- (inst jmp eax)
+ (inst mov rsp-tn rbp-tn)
+ (inst clc)
+ (inst pop rbp-tn)
+ (inst ret)
TWO-VALUES
+ (inst lea ebx (make-ea :qword :base rbp-tn
+ :disp (* sp->fp-offset n-word-bytes)))
(loadw edx esi -1)
(loadw edi esi -2)
(inst mov esi nil-value)
- (inst lea rsp-tn (make-ea :qword :base ebx :disp (* -2 n-word-bytes)))
- (inst jmp eax)
+ (inst mov rsp-tn rbp-tn)
+ (inst stc)
+ (inst pop rbp-tn)
+ (inst ret)
THREE-VALUES
+ (inst lea ebx (make-ea :qword :base rbp-tn
+ :disp (* sp->fp-offset n-word-bytes)))
(loadw edx esi -1)
(loadw edi esi -2)
(loadw esi esi -3)
- (inst lea rsp-tn (make-ea :qword :base ebx :disp (* -3 n-word-bytes)))
- (inst jmp eax))
+ (inst mov rsp-tn rbp-tn)
+ (inst stc)
+ (inst pop rbp-tn)
+ (inst ret))
\f
;;;; TAIL-CALL-VARIABLE
(move ecx esi)
(inst sub ecx rsp-tn)
- ;; Check for all the args fitting the the registers.
+ ;; Check for all the args fitting the registers.
(inst cmp ecx (fixnumize 3))
(inst jmp :le REGISTER-ARGS)
- ;; Save the OLD-FP and RETURN-PC because the blit it going to trash
- ;; those stack locations. Save the ECX, because the loop is going
- ;; to trash it.
- (pushw rbp-tn -1)
- (loadw ebx rbp-tn -2)
+ ;; Save the OLD-FP and RETURN-PC because the blit is going to trash
+ ;; those stack locations. Save the ECX, because the loop is going to
+ ;; trash it.
+ (pushw rbp-tn (frame-word-offset ocfp-save-offset))
+ (loadw ebx rbp-tn (frame-word-offset return-pc-save-offset))
(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.
- (inst shr ecx 3) ; fixnum to raw words
- (inst std) ; count down
- (inst lea edi (make-ea :qword :base rbp-tn :disp (- n-word-bytes)))
+ (inst shr ecx (1- n-lowtag-bits))
+ (inst std) ; count down
+ (inst lea edi (make-ea :qword :base rbp-tn :disp (frame-byte-offset 0)))
(inst sub esi (fixnumize 1))
(inst rep)
(inst movs :qword)
+ (inst cld)
;; Load the register arguments carefully.
- (loadw edx rbp-tn -1)
+ (loadw edx rbp-tn (frame-word-offset ocfp-save-offset))
;; Restore OLD-FP and ECX.
(inst pop ecx)
- (popw rbp-tn -1) ; overwrites a0
+ ;; Overwrites a1
+ (popw rbp-tn (frame-word-offset ocfp-save-offset))
;; Blow off the stack above the arguments.
(inst lea rsp-tn (make-ea :qword :base edi :disp n-word-bytes))
;; remaining register args
- (loadw edi rbp-tn -2)
- (loadw esi rbp-tn -3)
+ (inst mov edi edx)
+ (loadw edx rbp-tn (frame-word-offset 0))
+ (loadw esi rbp-tn (frame-word-offset 2))
;; Push the (saved) return-pc so it looks like we just called.
(inst push ebx)
;; And jump into the function.
- (inst jmp
- (make-ea :byte :base eax
- :disp (- (* closure-fun-slot n-word-bytes)
- fun-pointer-lowtag)))
+ (inst jmp
+ (make-ea :byte :base eax
+ :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 rsp-tn
- (make-ea :qword :base rbp-tn :disp (* -3 n-word-bytes)))
+ (make-ea :qword :base rbp-tn :disp (* (- sp->fp-offset 3) n-word-bytes)))
;; Push the return-pc so it looks like we just called.
- (pushw rbp-tn -2) ; XXX dan ?
-
+ (pushw rbp-tn (frame-word-offset return-pc-save-offset))
+
;; And away we go.
(inst jmp (make-ea :byte :base eax
- :disp (- (* closure-fun-slot n-word-bytes)
- fun-pointer-lowtag))))
+ :disp (- (* closure-fun-slot n-word-bytes)
+ fun-pointer-lowtag))))
\f
(define-assembly-routine (throw
- (:return-style :none))
- ((:arg target (descriptor-reg any-reg) rdx-offset)
- (:arg start any-reg rbx-offset)
- (:arg count any-reg rcx-offset)
- (:temp catch any-reg rax-offset))
+ (:return-style :none))
+ ((:arg target (descriptor-reg any-reg) rdx-offset)
+ (:arg start any-reg rbx-offset)
+ (:arg count any-reg rcx-offset)
+ (:temp catch any-reg rax-offset))
(declare (ignore start count))
LOOP
- (let ((error (generate-error-code nil unseen-throw-tag-error target)))
- (inst or catch catch) ; check for NULL pointer
+ (let ((error (generate-error-code nil 'unseen-throw-tag-error target)))
+ (inst or catch catch) ; check for NULL pointer
(inst jmp :z error))
(inst cmp target (make-ea-for-object-slot catch catch-block-tag-slot 0))
- (inst jmp :e exit)
+ (inst jmp :e EXIT)
(loadw catch catch catch-block-previous-catch-slot)
- (inst jmp loop)
+ (inst jmp LOOP)
EXIT
;;;; non-local exit noise
(define-assembly-routine (unwind
- (:return-style :none)
- (:translate %continue-unwind)
- (:policy :fast-safe))
- ((:arg block (any-reg descriptor-reg) rax-offset)
- (:arg start (any-reg descriptor-reg) rbx-offset)
- (:arg count (any-reg descriptor-reg) rcx-offset)
- (:temp uwp unsigned-reg rsi-offset))
+ (:return-style :none)
+ (:translate %continue-unwind)
+ (:policy :fast-safe))
+ ((:arg block (any-reg descriptor-reg) rax-offset)
+ (:arg start (any-reg descriptor-reg) rbx-offset)
+ (:arg count (any-reg descriptor-reg) rcx-offset)
+ (:temp uwp unsigned-reg rsi-offset))
(declare (ignore start count))
- (let ((error (generate-error-code nil invalid-unwind-error)))
- (inst or block block) ; check for NULL pointer
+ (let ((error (generate-error-code nil 'invalid-unwind-error)))
+ (inst or block block) ; check for NULL pointer
(inst jmp :z error))
(load-tl-symbol-value uwp *current-unwind-protect-block*)
;; Does *CURRENT-UNWIND-PROTECT-BLOCK* match the value stored in
;; argument's CURRENT-UWP-SLOT?
(inst cmp uwp
- (make-ea-for-object-slot block unwind-block-current-uwp-slot 0))
+ (make-ea-for-object-slot block unwind-block-current-uwp-slot 0))
;; If a match, return to context in arg block.
- (inst jmp :e do-exit)
+ (inst jmp :e DO-EXIT)
;; Not a match - return to *CURRENT-UNWIND-PROTECT-BLOCK* context.
;; Important! Must save (and return) the arg 'block' for later use!!
;; count in ecx-tn.
(inst jmp (make-ea :byte :base block
- :disp (* unwind-block-entry-pc-slot n-word-bytes))))
+ :disp (* unwind-block-entry-pc-slot n-word-bytes))))