X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fx86%2Fassem-rtns.lisp;h=1c23f0a79d906a1bd353bdb125c135bbcb72ef22;hb=27a88f9d3a898640b8bc03bc6699cdee7e058732;hp=36152cd441c0a0b28d09b7279054a2e7e6fddda9;hpb=2973941cf214a5ea274cd0381a651ce0e1a7fab2;p=sbcl.git diff --git a/src/assembly/x86/assem-rtns.lisp b/src/assembly/x86/assem-rtns.lisp index 36152cd..1c23f0a 100644 --- a/src/assembly/x86/assem-rtns.lisp +++ b/src/assembly/x86/assem-rtns.lisp @@ -20,13 +20,13 @@ #+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 eax-offset) - (:temp ebx unsigned-reg ebx-offset) + (;; These are really arguments. (:temp ecx unsigned-reg ecx-offset) (:temp esi unsigned-reg esi-offset) ;; These we need as temporaries. + (:temp eax unsigned-reg eax-offset) + (:temp ebx unsigned-reg ebx-offset) (:temp edx unsigned-reg edx-offset) (:temp edi unsigned-reg edi-offset)) @@ -39,18 +39,27 @@ (inst cmp ecx (fixnumize 3)) (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 :dword :base ebp-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 :dword :base ebp-tn + :disp (frame-byte-offset return-pc-save-offset))) + (inst mov ebp-tn (make-ea :dword :base ebp-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 2) ; fixnum to raw word count + (inst shr ecx (1- n-lowtag-bits)) (inst std) ; count down - (inst sub esi 4) ; ? + (inst sub esi n-word-bytes) (inst lea edi (make-ea :dword :base ebx :disp (- n-word-bytes))) (inst rep) (inst movs :dword) @@ -69,39 +78,51 @@ ;; And back we go. (inst stc) - (inst jmp eax) + (inst push eax) + (inst ret) ;; Handle the register arg cases. ZERO-VALUES - (move esp-tn ebx) + (inst lea ebx (make-ea :dword :base ebp-tn + :disp (* sp->fp-offset n-word-bytes))) (inst mov edx nil-value) (inst mov edi edx) (inst mov esi edx) + (inst mov esp-tn ebp-tn) (inst stc) - (inst jmp eax) + (inst pop ebp-tn) + (inst ret) - ONE-VALUE ; Note: we can get this, because the return-multiple vop - ; doesn't check for this case when size > speed. + ;; 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 esp-tn ebx) + (inst mov esp-tn ebp-tn) (inst clc) - (inst jmp eax) + (inst pop ebp-tn) + (inst ret) TWO-VALUES + (inst lea ebx (make-ea :dword :base ebp-tn + :disp (* sp->fp-offset n-word-bytes))) (loadw edx esi -1) (loadw edi esi -2) (inst mov esi nil-value) - (inst lea esp-tn (make-ea :dword :base ebx :disp (* -2 n-word-bytes))) + (inst mov esp-tn ebp-tn) (inst stc) - (inst jmp eax) + (inst pop ebp-tn) + (inst ret) THREE-VALUES + (inst lea ebx (make-ea :dword :base ebp-tn + :disp (* sp->fp-offset n-word-bytes))) (loadw edx esi -1) (loadw edi esi -2) (loadw esi esi -3) - (inst lea esp-tn (make-ea :dword :base ebx :disp (* -3 n-word-bytes))) + (inst mov esp-tn ebp-tn) (inst stc) - (inst jmp eax)) + (inst pop ebp-tn) + (inst ret)) ;;;; TAIL-CALL-VARIABLE @@ -145,7 +166,7 @@ ;; 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 shr ecx (1- n-lowtag-bits)) (inst std) ; count down (inst lea edi (make-ea :dword :base ebp-tn :disp (frame-byte-offset 0))) (inst sub esi (fixnumize 1)) @@ -183,7 +204,7 @@ ;; Clear most of the stack. (inst lea esp-tn - (make-ea :dword :base ebp-tn :disp (* -3 n-word-bytes))) + (make-ea :dword :base ebp-tn :disp (* (- sp->fp-offset 3) n-word-bytes))) ;; Push the return-pc so it looks like we just called. (pushw ebp-tn (frame-word-offset return-pc-save-offset)) @@ -192,7 +213,7 @@ (inst jmp (make-ea-for-object-slot eax closure-fun-slot fun-pointer-lowtag))) (define-assembly-routine (throw - (:return-style :none)) + (:return-style :raw)) ((:arg target (descriptor-reg any-reg) edx-offset) (:arg start any-reg ebx-offset) (:arg count any-reg ecx-offset) @@ -204,8 +225,18 @@ LOOP - (let ((error (generate-error-code nil 'unseen-throw-tag-error target))) - (inst or catch catch) ; check for NULL pointer + (let ((error (gen-label))) + (assemble (*elsewhere*) + (emit-label error) + + ;; Fake up a stack frame so that backtraces come out right. + (inst push ebp-tn) + (inst mov ebp-tn esp-tn) + + (emit-error-break nil error-trap + (error-number-or-lose 'unseen-throw-tag-error) + (list target))) + (inst test catch catch) ; check for NULL pointer (inst jmp :z error)) (inst cmp target (make-ea-for-object-slot catch catch-block-tag-slot 0)) @@ -233,7 +264,7 @@ (declare (ignore start count)) (let ((error (generate-error-code nil 'invalid-unwind-error))) - (inst or block block) ; check for NULL pointer + (inst test block block) ; check for NULL pointer (inst jmp :z error)) (load-tl-symbol-value uwp *current-unwind-protect-block*) @@ -278,7 +309,7 @@ (declare (ignore start count)) (let ((error (generate-error-code nil 'invalid-unwind-error))) - (inst or block block) ; check for NULL pointer + (inst test block block) ; check for NULL pointer (inst jmp :z error)) ;; Save all our registers, as we're about to clobber them.