X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fassembly%2Fx86-64%2Fassem-rtns.lisp;h=0b2f65e30a964bc3bda9f73d9fa6374e8cae1374;hb=8643c93d4db277f6e1cb880a42407ff29e19f618;hp=caa75e53e5a5cab6c014ea3b3b0ac0e0cf01e7fb;hpb=78fa16bf55be44cc16845be84d98023e83fb14bc;p=sbcl.git diff --git a/src/assembly/x86-64/assem-rtns.lisp b/src/assembly/x86-64/assem-rtns.lisp index caa75e5..0b2f65e 100644 --- a/src/assembly/x86-64/assem-rtns.lisp +++ b/src/assembly/x86-64/assem-rtns.lisp @@ -31,13 +31,13 @@ (:temp edi unsigned-reg rdi-offset)) ;; Pick off the cases where everything fits in register args. - (inst jecxz zero-values) + (inst jecxz 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) @@ -48,9 +48,9 @@ ;; 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 3) ; fixnum to raw word count + (inst std) ; count down + (inst sub esi 8) ; ? (inst lea edi (make-ea :qword :base ebx :disp (- n-word-bytes))) (inst rep) (inst movs :qword) @@ -67,6 +67,7 @@ (loadw esi ebx -3) ;; And back we go. + (inst stc) (inst jmp eax) ;; Handle the register arg cases. @@ -75,13 +76,14 @@ (inst mov edx nil-value) (inst mov edi edx) (inst mov esi edx) + (inst stc) (inst jmp eax) ONE-VALUE ; Note: we can get this, because the return-multiple vop - ; doesn't check for this case when size > speed. + ; doesn't check for this case when size > speed. (loadw edx esi -1) (inst mov rsp-tn ebx) - (inst add eax 3) + (inst clc) (inst jmp eax) TWO-VALUES @@ -89,6 +91,7 @@ (loadw edi esi -2) (inst mov esi nil-value) (inst lea rsp-tn (make-ea :qword :base ebx :disp (* -2 n-word-bytes))) + (inst stc) (inst jmp eax) THREE-VALUES @@ -96,6 +99,7 @@ (loadw edi esi -2) (loadw esi esi -3) (inst lea rsp-tn (make-ea :qword :base ebx :disp (* -3 n-word-bytes))) + (inst stc) (inst jmp eax)) ;;;; TAIL-CALL-VARIABLE @@ -126,7 +130,7 @@ (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) @@ -140,8 +144,8 @@ ;; 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 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 sub esi (fixnumize 1)) (inst rep) @@ -152,7 +156,7 @@ ;; Restore OLD-FP and ECX. (inst pop ecx) - (popw rbp-tn -1) ; overwrites a0 + (popw rbp-tn -1) ; overwrites a0 ;; Blow off the stack above the arguments. (inst lea rsp-tn (make-ea :qword :base edi :disp n-word-bytes)) @@ -166,9 +170,9 @@ ;; And jump into the function. (inst jmp - (make-ea :byte :base eax - :disp (- (* closure-fun-slot n-word-bytes) - fun-pointer-lowtag))) + (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 @@ -178,22 +182,22 @@ ;; 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 (* -3 n-word-bytes))) ;; Push the return-pc so it looks like we just called. - (pushw rbp-tn -2) ; XXX dan ? - + (pushw rbp-tn -2) ; XXX dan ? + ;; 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)))) (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)) @@ -202,14 +206,14 @@ LOOP (let ((error (generate-error-code nil unseen-throw-tag-error target))) - (inst or catch catch) ; check for NULL pointer + (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 @@ -219,17 +223,17 @@ ;;;; 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 + (inst or block block) ; check for NULL pointer (inst jmp :z error)) (load-tl-symbol-value uwp *current-unwind-protect-block*) @@ -237,9 +241,9 @@ ;; 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!! @@ -260,4 +264,4 @@ ;; 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))))