X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fx86-64%2Fassem-rtns.lisp;h=125c15f04f11b5820a429ea7e9d539574109efca;hb=7acdf15e27993655c9249f79d36fe2117843dbdf;hp=727080223529357594575f9c3c1dbe5d3b0bac47;hpb=2973941cf214a5ea274cd0381a651ce0e1a7fab2;p=sbcl.git diff --git a/src/assembly/x86-64/assem-rtns.lisp b/src/assembly/x86-64/assem-rtns.lisp index 7270802..125c15f 100644 --- a/src/assembly/x86-64/assem-rtns.lisp +++ b/src/assembly/x86-64/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 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)) @@ -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 :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 shr ecx n-fixnum-tag-bits) (inst std) ; count down - (inst sub esi 8) ; ? + (inst sub esi n-word-bytes) (inst lea edi (make-ea :qword :base ebx :disp (- n-word-bytes))) (inst rep) (inst movs :qword) @@ -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 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 mov rsp-tn rbp-tn) (inst stc) - (inst jmp eax) + (inst pop rbp-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 rsp-tn ebx) + (inst mov rsp-tn rbp-tn) (inst clc) - (inst jmp eax) + (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 mov rsp-tn rbp-tn) (inst stc) - (inst jmp eax) + (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 mov rsp-tn rbp-tn) (inst stc) - (inst jmp eax)) + (inst pop rbp-tn) + (inst ret)) ;;;; TAIL-CALL-VARIABLE @@ -130,9 +151,11 @@ ;; Calculate NARGS (as a fixnum) (move ecx esi) (inst sub ecx rsp-tn) + #!-#.(cl:if (cl:= sb!vm:word-shift sb!vm:n-fixnum-tag-bits) '(and) '(or)) + (inst shr ecx (- word-shift n-fixnum-tag-bits)) ;; Check for all the args fitting the registers. - (inst cmp ecx (fixnumize 3)) + (inst cmp ecx (fixnumize register-arg-count)) (inst jmp :le REGISTER-ARGS) ;; Save the OLD-FP and RETURN-PC because the blit is going to trash @@ -145,10 +168,10 @@ ;; 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 shr ecx n-fixnum-tag-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 sub esi n-word-bytes) (inst rep) (inst movs :qword) (inst cld) @@ -186,7 +209,7 @@ ;; 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 (frame-word-offset return-pc-save-offset)) @@ -197,7 +220,7 @@ fun-pointer-lowtag)))) (define-assembly-routine (throw - (:return-style :none)) + (:return-style :raw)) ((:arg target (descriptor-reg any-reg) rdx-offset) (:arg start any-reg rbx-offset) (:arg count any-reg rcx-offset) @@ -209,8 +232,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 rbp-tn) + (inst mov rbp-tn rsp-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)) @@ -237,7 +270,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*)