X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Fcall.lisp;h=ace16ff40d59eb53a84e6e8c4a0e7d58efb27ec5;hb=293488f3b117854e12b0d7f4faeb742b707bbc9c;hp=73ff2ac8ef2042657700fcbebb44dd86718211f7;hpb=2973941cf214a5ea274cd0381a651ce0e1a7fab2;p=sbcl.git diff --git a/src/compiler/x86-64/call.lisp b/src/compiler/x86-64/call.lisp index 73ff2ac..ace16ff 100644 --- a/src/compiler/x86-64/call.lisp +++ b/src/compiler/x86-64/call.lisp @@ -119,6 +119,26 @@ (:generator 1 nil)) +;;; Accessing a slot from an earlier stack frame is definite hackery. +(define-vop (ancestor-frame-ref) + (:args (frame-pointer :scs (descriptor-reg)) + (variable-home-tn :load-if nil)) + (:results (value :scs (descriptor-reg any-reg))) + (:policy :fast-safe) + (:generator 4 + (aver (sc-is variable-home-tn control-stack)) + (loadw value frame-pointer + (frame-word-offset (tn-offset variable-home-tn))))) +(define-vop (ancestor-frame-set) + (:args (frame-pointer :scs (descriptor-reg)) + (value :scs (descriptor-reg any-reg))) + (:results (variable-home-tn :load-if nil)) + (:policy :fast-safe) + (:generator 4 + (aver (sc-is variable-home-tn control-stack)) + (storew value frame-pointer + (frame-word-offset (tn-offset variable-home-tn))))) + (define-vop (xep-allocate-frame) (:info start-lab copy-more-arg-follows) (:vop-var vop) @@ -143,7 +163,8 @@ (inst lea rsp-tn (make-ea :qword :base rbp-tn :disp (- (* n-word-bytes - (max 3 (sb-allocated-size 'stack))))))) + (- (max 3 (sb-allocated-size 'stack)) + sp->fp-offset)))))) (trace-table-entry trace-table-normal))) @@ -151,12 +172,13 @@ ;;; or a multiple-call-local. All it does is allocate stack space for the ;;; callee (who has the same size stack as us). (define-vop (allocate-frame) - (:results (res :scs (any-reg control-stack)) + (:results (res :scs (any-reg)) (nfp)) (:info callee) (:ignore nfp callee) (:generator 2 - (move res rsp-tn) + (inst lea res (make-ea :qword :base rsp-tn + :disp (- (* sp->fp-offset n-word-bytes)))) (inst sub rsp-tn (* n-word-bytes (sb-allocated-size 'stack))))) ;;; Allocate a partial frame for passing stack arguments in a full @@ -165,9 +187,10 @@ ;;; before it can extend the stack. (define-vop (allocate-full-call-frame) (:info nargs) - (:results (res :scs (any-reg control-stack))) + (:results (res :scs (any-reg))) (:generator 2 - (move res rsp-tn) + (inst lea res (make-ea :qword :base rsp-tn + :disp (- (* sp->fp-offset n-word-bytes)))) (inst sub rsp-tn (* (max nargs 3) n-word-bytes)))) ;;; Emit code needed at the return-point from an unknown-values call @@ -176,12 +199,6 @@ ;;; Nvals is the number of values that are to be received (should ;;; equal the length of Values). ;;; -;;; MOVE-TEMP is a DESCRIPTOR-REG TN used as a temporary. -;;; -;;; This code exploits the fact that in the unknown-values convention, -;;; a single value return returns at the return PC + 2, whereas a -;;; return of other than one value returns directly at the return PC. -;;; ;;; If 0 or 1 values are expected, then we just emit an instruction to ;;; reset the SP (which will only be executed when other than 1 value ;;; is returned.) @@ -194,170 +211,189 @@ ;;; there are stack values. ;;; -- Reset SP. This must be done whenever other than 1 value is ;;; returned, regardless of the number of values desired. -(defun default-unknown-values (vop values nvals) +(defun default-unknown-values (vop values nvals node) (declare (type (or tn-ref null) values) (type unsigned-byte nvals)) - (cond - ((<= nvals 1) - (note-this-location vop :single-value-return) - (inst cmov :c rsp-tn rbx-tn)) - ((<= nvals register-arg-count) - (let ((regs-defaulted (gen-label))) - (note-this-location vop :unknown-return) - (inst jmp :c regs-defaulted) - ;; Default the unsupplied registers. - (let* ((2nd-tn-ref (tn-ref-across values)) - (2nd-tn (tn-ref-tn 2nd-tn-ref))) - (inst mov 2nd-tn nil-value) - (when (> nvals 2) - (loop - for tn-ref = (tn-ref-across 2nd-tn-ref) - then (tn-ref-across tn-ref) - for count from 2 below register-arg-count - do (inst mov (tn-ref-tn tn-ref) 2nd-tn)))) - (inst mov rbx-tn rsp-tn) - (emit-label regs-defaulted) - (inst mov rsp-tn rbx-tn))) - ((<= nvals 7) - ;; The number of bytes depends on the relative jump instructions. - ;; Best case is 31+(n-3)*14, worst case is 35+(n-3)*18. For - ;; NVALS=6 that is 73/89 bytes, and for NVALS=7 that is 87/107 - ;; bytes which is likely better than using the blt below. - (let ((regs-defaulted (gen-label)) - (defaulting-done (gen-label)) - (default-stack-slots (gen-label))) - (note-this-location vop :unknown-return) - ;; Branch off to the MV case. - (inst jmp :c regs-defaulted) - ;; Do the single value case. - ;; Default the register args - (inst mov rax-tn nil-value) - (do ((i 1 (1+ i)) - (val (tn-ref-across values) (tn-ref-across val))) - ((= i (min nvals register-arg-count))) - (inst mov (tn-ref-tn val) rax-tn)) - - ;; Fake other registers so it looks like we returned with all the - ;; registers filled in. - (move rbx-tn rsp-tn) - (inst push rdx-tn) - (inst jmp default-stack-slots) - - (emit-label regs-defaulted) - - (inst mov rax-tn nil-value) - (storew rdx-tn rbx-tn -1) - (collect ((defaults)) - (do ((i register-arg-count (1+ i)) - (val (do ((i 0 (1+ i)) - (val values (tn-ref-across val))) - ((= i register-arg-count) val)) - (tn-ref-across val))) - ((null val)) - (let ((default-lab (gen-label)) - (tn (tn-ref-tn val))) - (defaults (cons default-lab tn)) - - (inst cmp rcx-tn (fixnumize i)) - (inst jmp :be default-lab) - (loadw rdx-tn rbx-tn (frame-word-offset i)) - (inst mov tn rdx-tn))) - - (emit-label defaulting-done) - (loadw rdx-tn rbx-tn -1) - (move rsp-tn rbx-tn) - - (let ((defaults (defaults))) - (when defaults - (assemble (*elsewhere*) - (trace-table-entry trace-table-fun-prologue) - (emit-label default-stack-slots) - (dolist (default defaults) - (emit-label (car default)) - (inst mov (cdr default) rax-tn)) - (inst jmp defaulting-done) - (trace-table-entry trace-table-normal))))))) - (t - (let ((regs-defaulted (gen-label)) - (restore-edi (gen-label)) - (no-stack-args (gen-label)) - (default-stack-vals (gen-label)) - (count-okay (gen-label))) - (note-this-location vop :unknown-return) - ;; Branch off to the MV case. - (inst jmp :c regs-defaulted) - - ;; Default the register args, and set up the stack as if we - ;; entered the MV return point. - (inst mov rbx-tn rsp-tn) - (inst push rdx-tn) - (inst mov rdi-tn nil-value) - (inst push rdi-tn) - (inst mov rsi-tn rdi-tn) - ;; Compute a pointer to where to put the [defaulted] stack values. - (emit-label no-stack-args) - (inst lea rdi-tn - (make-ea :qword :base rbp-tn - :disp (frame-byte-offset register-arg-count))) - ;; Load RAX with NIL so we can quickly store it, and set up - ;; stuff for the loop. - (inst mov rax-tn nil-value) - (inst std) - (inst mov rcx-tn (- nvals register-arg-count)) - ;; Jump into the default loop. - (inst jmp default-stack-vals) - - ;; The regs are defaulted. We need to copy any stack arguments, - ;; and then default the remaining stack arguments. - (emit-label regs-defaulted) - ;; Save EDI. - (storew rdi-tn rbx-tn (frame-word-offset 1)) - ;; Compute the number of stack arguments, and if it's zero or - ;; less, don't copy any stack arguments. - (inst sub rcx-tn (fixnumize register-arg-count)) - (inst jmp :le no-stack-args) - - ;; Throw away any unwanted args. - (inst cmp rcx-tn (fixnumize (- nvals register-arg-count))) - (inst jmp :be count-okay) - (inst mov rcx-tn (fixnumize (- nvals register-arg-count))) - (emit-label count-okay) - ;; Save the number of stack values. - (inst mov rax-tn rcx-tn) - ;; Compute a pointer to where the stack args go. - (inst lea rdi-tn - (make-ea :qword :base rbp-tn - :disp (frame-byte-offset register-arg-count))) - ;; Save ESI, and compute a pointer to where the args come from. - (storew rsi-tn rbx-tn (frame-word-offset 2)) - (inst lea rsi-tn - (make-ea :qword :base rbx-tn - :disp (frame-byte-offset register-arg-count))) - ;; Do the copy. - (inst shr rcx-tn word-shift) ; make word count - (inst std) - (inst rep) - (inst movs :qword) - ;; Restore RSI. - (loadw rsi-tn rbx-tn (frame-word-offset 2)) - ;; Now we have to default the remaining args. Find out how many. - (inst sub rax-tn (fixnumize (- nvals register-arg-count))) - (inst neg rax-tn) - ;; If none, then just blow out of here. - (inst jmp :le restore-edi) - (inst mov rcx-tn rax-tn) - (inst shr rcx-tn word-shift) ; word count - ;; Load RAX with NIL for fast storing. - (inst mov rax-tn nil-value) - ;; Do the store. - (emit-label default-stack-vals) - (inst rep) - (inst stos rax-tn) - ;; Restore EDI, and reset the stack. - (emit-label restore-edi) - (loadw rdi-tn rbx-tn (frame-word-offset 1)) - (inst mov rsp-tn rbx-tn) - (inst cld)))) + (let ((type (sb!c::basic-combination-derived-type node))) + (cond + ((<= nvals 1) + (note-this-location vop :single-value-return) + (cond + ((<= (sb!kernel:values-type-max-value-count type) + register-arg-count) + (when (and (named-type-p type) + (eq nil (named-type-name type))) + ;; The function never returns, it may happen that the code + ;; ends right here leavig the :SINGLE-VALUE-RETURN note + ;; dangling. Let's emit a NOP. + (inst nop))) + ((not (sb!kernel:values-type-may-be-single-value-p type)) + (inst mov rsp-tn rbx-tn)) + (t + (inst cmov :c rsp-tn rbx-tn)))) + ((<= nvals register-arg-count) + (note-this-location vop :unknown-return) + (when (sb!kernel:values-type-may-be-single-value-p type) + (let ((regs-defaulted (gen-label))) + (inst jmp :c regs-defaulted) + ;; Default the unsupplied registers. + (let* ((2nd-tn-ref (tn-ref-across values)) + (2nd-tn (tn-ref-tn 2nd-tn-ref))) + (inst mov 2nd-tn nil-value) + (when (> nvals 2) + (loop + for tn-ref = (tn-ref-across 2nd-tn-ref) + then (tn-ref-across tn-ref) + for count from 2 below register-arg-count + do (inst mov (tn-ref-tn tn-ref) 2nd-tn)))) + (inst mov rbx-tn rsp-tn) + (emit-label regs-defaulted))) + (when (< register-arg-count + (sb!kernel:values-type-max-value-count type)) + (inst mov rsp-tn rbx-tn))) + ((<= nvals 7) + ;; The number of bytes depends on the relative jump instructions. + ;; Best case is 31+(n-3)*14, worst case is 35+(n-3)*18. For + ;; NVALS=6 that is 73/89 bytes, and for NVALS=7 that is 87/107 + ;; bytes which is likely better than using the blt below. + (let ((regs-defaulted (gen-label)) + (defaulting-done (gen-label)) + (default-stack-slots (gen-label))) + (note-this-location vop :unknown-return) + ;; Branch off to the MV case. + (inst jmp :c regs-defaulted) + ;; Do the single value case. + ;; Default the register args + (inst mov rax-tn nil-value) + (do ((i 1 (1+ i)) + (val (tn-ref-across values) (tn-ref-across val))) + ((= i (min nvals register-arg-count))) + (inst mov (tn-ref-tn val) rax-tn)) + ;; Fake other registers so it looks like we returned with all the + ;; registers filled in. + (move rbx-tn rsp-tn) + (inst jmp default-stack-slots) + (emit-label regs-defaulted) + (inst mov rax-tn nil-value) + (collect ((defaults)) + (do ((i register-arg-count (1+ i)) + (val (do ((i 0 (1+ i)) + (val values (tn-ref-across val))) + ((= i register-arg-count) val)) + (tn-ref-across val))) + ((null val)) + (let ((default-lab (gen-label)) + (tn (tn-ref-tn val)) + (first-stack-arg-p (= i register-arg-count))) + (defaults (cons default-lab + (cons tn first-stack-arg-p))) + (inst cmp rcx-tn (fixnumize i)) + (inst jmp :be default-lab) + (when first-stack-arg-p + ;; There are stack args so the frame of the callee is + ;; still there, save RDX in its first slot temporalily. + (storew rdx-tn rbx-tn (frame-word-offset sp->fp-offset))) + (loadw rdx-tn rbx-tn (frame-word-offset (+ sp->fp-offset i))) + (inst mov tn rdx-tn))) + (emit-label defaulting-done) + (loadw rdx-tn rbx-tn (frame-word-offset sp->fp-offset)) + (move rsp-tn rbx-tn) + (let ((defaults (defaults))) + (when defaults + (assemble (*elsewhere*) + (trace-table-entry trace-table-fun-prologue) + (emit-label default-stack-slots) + (dolist (default defaults) + (emit-label (car default)) + (when (cddr default) + ;; We are setting the first stack argument to NIL. + ;; The callee's stack frame is dead, save RDX by + ;; pushing it to the stack, it will end up at same + ;; place as in the (STOREW RDX-TN RBX-TN -1) case + ;; above. + (inst push rdx-tn)) + (inst mov (second default) rax-tn)) + (inst jmp defaulting-done) + (trace-table-entry trace-table-normal))))))) + (t + (let ((regs-defaulted (gen-label)) + (restore-edi (gen-label)) + (no-stack-args (gen-label)) + (default-stack-vals (gen-label)) + (count-okay (gen-label))) + (note-this-location vop :unknown-return) + ;; Branch off to the MV case. + (inst jmp :c regs-defaulted) + ;; Default the register args, and set up the stack as if we + ;; entered the MV return point. + (inst mov rbx-tn rsp-tn) + (inst mov rdi-tn nil-value) + (inst mov rsi-tn rdi-tn) + ;; Compute a pointer to where to put the [defaulted] stack values. + (emit-label no-stack-args) + (inst push rdx-tn) + (inst push rdi-tn) + (inst lea rdi-tn + (make-ea :qword :base rbp-tn + :disp (frame-byte-offset register-arg-count))) + ;; Load RAX with NIL so we can quickly store it, and set up + ;; stuff for the loop. + (inst mov rax-tn nil-value) + (inst std) + (inst mov rcx-tn (- nvals register-arg-count)) + ;; Jump into the default loop. + (inst jmp default-stack-vals) + ;; The regs are defaulted. We need to copy any stack arguments, + ;; and then default the remaining stack arguments. + (emit-label regs-defaulted) + ;; Compute the number of stack arguments, and if it's zero or + ;; less, don't copy any stack arguments. + (inst sub rcx-tn (fixnumize register-arg-count)) + (inst jmp :le no-stack-args) + ;; Save EDI. + (storew rdi-tn rbx-tn (frame-word-offset (+ sp->fp-offset 1))) + ;; Throw away any unwanted args. + (inst cmp rcx-tn (fixnumize (- nvals register-arg-count))) + (inst jmp :be count-okay) + (inst mov rcx-tn (fixnumize (- nvals register-arg-count))) + (emit-label count-okay) + ;; Save the number of stack values. + (inst mov rax-tn rcx-tn) + ;; Compute a pointer to where the stack args go. + (inst lea rdi-tn + (make-ea :qword :base rbp-tn + :disp (frame-byte-offset register-arg-count))) + ;; Save ESI, and compute a pointer to where the args come from. + (storew rsi-tn rbx-tn (frame-word-offset (+ sp->fp-offset 2))) + (inst lea rsi-tn + (make-ea :qword :base rbx-tn + :disp (frame-byte-offset + (+ sp->fp-offset register-arg-count)))) + ;; Do the copy. + (inst shr rcx-tn word-shift) ; make word count + (inst std) + (inst rep) + (inst movs :qword) + ;; Restore RSI. + (loadw rsi-tn rbx-tn (frame-word-offset (+ sp->fp-offset 2))) + ;; Now we have to default the remaining args. Find out how many. + (inst sub rax-tn (fixnumize (- nvals register-arg-count))) + (inst neg rax-tn) + ;; If none, then just blow out of here. + (inst jmp :le restore-edi) + (inst mov rcx-tn rax-tn) + (inst shr rcx-tn word-shift) ; word count + ;; Load RAX with NIL for fast storing. + (inst mov rax-tn nil-value) + ;; Do the store. + (emit-label default-stack-vals) + (inst rep) + (inst stos rax-tn) + ;; Restore EDI, and reset the stack. + (emit-label restore-edi) + (loadw rdi-tn rbx-tn (frame-word-offset (+ sp->fp-offset 1))) + (inst mov rsp-tn rbx-tn) + (inst cld))))) (values)) ;;;; unknown values receiving @@ -379,27 +415,37 @@ ;;; explicitly allocate these TNs, since their lifetimes overlap with ;;; the results start and count. (Also, it's nice to be able to target ;;; them.) -(defun receive-unknown-values (args nargs start count) +(defun receive-unknown-values (args nargs start count node) (declare (type tn args nargs start count)) - (let ((variable-values (gen-label)) + (let ((type (sb!c::basic-combination-derived-type node)) + (variable-values (gen-label)) + (stack-values (gen-label)) (done (gen-label))) - (inst jmp :c variable-values) - - (cond ((location= start (first *register-arg-tns*)) - (inst push (first *register-arg-tns*)) - (inst lea start (make-ea :qword :base rsp-tn :disp n-word-bytes))) - (t (inst mov start rsp-tn) - (inst push (first *register-arg-tns*)))) - (inst mov count (fixnumize 1)) - (inst jmp done) - - (emit-label variable-values) + (when (sb!kernel:values-type-may-be-single-value-p type) + (inst jmp :c variable-values) + (cond ((location= start (first *register-arg-tns*)) + (inst push (first *register-arg-tns*)) + (inst lea start (make-ea :qword :base rsp-tn :disp n-word-bytes))) + (t (inst mov start rsp-tn) + (inst push (first *register-arg-tns*)))) + (inst mov count (fixnumize 1)) + (inst jmp done) + (emit-label variable-values)) + ;; The stack frame is burnt and RETurned from if there are no + ;; stack values. In this case quickly reallocate sufficient space. + (when (<= (sb!kernel:values-type-min-value-count type) + register-arg-count) + (inst cmp nargs (fixnumize register-arg-count)) + (inst jmp :g stack-values) + (inst sub rsp-tn nargs) + (emit-label stack-values)) ;; dtc: this writes the registers onto the stack even if they are ;; not needed, only the number specified in rcx are used and have ;; stack allocated to them. No harm is done. (loop for arg in *register-arg-tns* for i downfrom -1 + for j below (sb!kernel:values-type-max-value-count type) do (storew arg args i)) (move start args) (move count nargs) @@ -421,6 +467,36 @@ ;;;; local call with unknown values convention return +(defun check-ocfp-and-return-pc (old-fp return-pc) + #+nil + (format t "*known-return: old-fp ~S, tn-kind ~S; ~S ~S~%" + old-fp (sb!c::tn-kind old-fp) (sb!c::tn-save-tn old-fp) + (sb!c::tn-kind (sb!c::tn-save-tn old-fp))) + #+nil + (format t "*known-return: return-pc ~S, tn-kind ~S; ~S ~S~%" + return-pc (sb!c::tn-kind return-pc) + (sb!c::tn-save-tn return-pc) + (sb!c::tn-kind (sb!c::tn-save-tn return-pc))) + (unless (and (sc-is old-fp control-stack) + (= (tn-offset old-fp) ocfp-save-offset)) + (error "ocfp not on stack in standard save location?")) + (unless (and (sc-is return-pc sap-stack) + (= (tn-offset return-pc) return-pc-save-offset)) + (error "return-pc not on stack in standard save location?"))) + +;;; The local call convention doesn't fit that well with x86-style +;;; calls. Emit a header for local calls to pop the return address +;;; in the right place. +(defun emit-block-header (start-label trampoline-label fall-thru-p alignp) + (when (and fall-thru-p (or trampoline-label alignp)) + (inst jmp start-label)) + (when alignp + (emit-alignment n-lowtag-bits #x90)) + (when trampoline-label + (emit-label trampoline-label) + (popw rbp-tn (frame-word-offset return-pc-save-offset))) + (emit-label start-label)) + ;;; Non-TR local call for a fixed number of values passed according to ;;; the unknown values convention. ;;; @@ -444,39 +520,19 @@ (:args (fp) (nfp) (args :more t)) - (:temporary (:sc unsigned-reg) return-label) (:results (values :more t)) (:save-p t) (:move-args :local-call) (:info arg-locs callee target nvals) (:vop-var vop) - (:ignore nfp arg-locs args #+nil callee) + (:ignore nfp arg-locs args callee) + (:node-var node) (:generator 5 (trace-table-entry trace-table-call-site) (move rbp-tn fp) - - (let ((ret-tn (callee-return-pc-tn callee))) - #+nil - (format t "*call-local ~S; tn-kind ~S; tn-save-tn ~S; its tn-kind ~S~%" - ret-tn (sb!c::tn-kind ret-tn) (sb!c::tn-save-tn ret-tn) - (sb!c::tn-kind (sb!c::tn-save-tn ret-tn))) - - ;; Is the return-pc on the stack or in a register? - (sc-case ret-tn - ((sap-stack) - (unless (= (tn-offset ret-tn) return-pc-save-offset) - (error "ret-tn ~A in wrong stack slot" ret-tn)) - #+nil (format t "*call-local: ret-tn on stack; offset=~S~%" - (tn-offset ret-tn)) - (inst lea return-label (make-fixup nil :code-object RETURN)) - (storew return-label rbp-tn (frame-word-offset (tn-offset ret-tn)))) - (t - (error "ret-tn ~A in sap-reg" ret-tn)))) - (note-this-location vop :call-site) - (inst jmp target) - RETURN - (default-unknown-values vop values nvals) + (inst call target) + (default-unknown-values vop values nvals node) (trace-table-entry trace-table-normal))) ;;; Non-TR local call for a variable number of return values passed according @@ -486,38 +542,19 @@ (:args (fp) (nfp) (args :more t)) - (:temporary (:sc unsigned-reg) return-label) (:save-p t) (:move-args :local-call) (:info save callee target) - (:ignore args save nfp #+nil callee) + (:ignore args save nfp callee) (:vop-var vop) + (:node-var node) (:generator 20 (trace-table-entry trace-table-call-site) (move rbp-tn fp) - - (let ((ret-tn (callee-return-pc-tn callee))) - #+nil - (format t "*multiple-call-local ~S; tn-kind ~S; tn-save-tn ~S; its tn-kind ~S~%" - ret-tn (sb!c::tn-kind ret-tn) (sb!c::tn-save-tn ret-tn) - (sb!c::tn-kind (sb!c::tn-save-tn ret-tn))) - - ;; Is the return-pc on the stack or in a register? - (sc-case ret-tn - ((sap-stack) - #+nil (format t "*multiple-call-local: ret-tn on stack; offset=~S~%" - (tn-offset ret-tn)) - ;; Stack - (inst lea return-label (make-fixup nil :code-object RETURN)) - (storew return-label rbp-tn (frame-word-offset (tn-offset ret-tn)))) - (t - (error "multiple-call-local: return-pc not on stack.")))) - (note-this-location vop :call-site) - (inst jmp target) - RETURN + (inst call target) (note-this-location vop :unknown-return) - (receive-unknown-values values-start nvals start count) + (receive-unknown-values values-start nvals start count node) (trace-table-entry trace-table-normal))) ;;;; local call with known values return @@ -532,83 +569,24 @@ (:args (fp) (nfp) (args :more t)) - (:temporary (:sc unsigned-reg) return-label) (:results (res :more t)) (:move-args :local-call) (:save-p t) (:info save callee target) - (:ignore args res save nfp #+nil callee) + (:ignore args res save nfp callee) (:vop-var vop) (:generator 5 (trace-table-entry trace-table-call-site) (move rbp-tn fp) - - (let ((ret-tn (callee-return-pc-tn callee))) - - #+nil - (format t "*known-call-local ~S; tn-kind ~S; tn-save-tn ~S; its tn-kind ~S~%" - ret-tn (sb!c::tn-kind ret-tn) (sb!c::tn-save-tn ret-tn) - (sb!c::tn-kind (sb!c::tn-save-tn ret-tn))) - - ;; Is the return-pc on the stack or in a register? - (sc-case ret-tn - ((sap-stack) - #+nil (format t "*known-call-local: ret-tn on stack; offset=~S~%" - (tn-offset ret-tn)) - ;; Stack - (inst lea return-label (make-fixup nil :code-object RETURN)) - (storew return-label rbp-tn (frame-word-offset (tn-offset ret-tn)))) - (t - (error "known-call-local: return-pc not on stack.")))) - (note-this-location vop :call-site) - (inst jmp target) - RETURN + (inst call target) (note-this-location vop :known-return) (trace-table-entry trace-table-normal))) -;;; Return from known values call. We receive the return locations as -;;; arguments to terminate their lifetimes in the returning function. We -;;; restore FP and CSP and jump to the Return-PC. -;;; -;;; We can assume we know exactly where old-fp and return-pc are because -;;; make-old-fp-save-location and make-return-pc-save-location always -;;; return the same place. -#+nil -(define-vop (known-return) - (:args (old-fp) - (return-pc :scs (any-reg immediate-stack) :target rpc) - (vals :more t)) - (:move-args :known-return) - (:info val-locs) - (:temporary (:sc unsigned-reg :from (:argument 1)) rpc) - (:ignore val-locs vals) - (:vop-var vop) - (:generator 6 - (trace-table-entry trace-table-fun-epilogue) - ;; Save the return-pc in a register 'cause the frame-pointer is - ;; going away. Note this not in the usual stack location so we - ;; can't use RET - (move rpc return-pc) - ;; Restore the stack. - (move rsp-tn rbp-tn) - ;; Restore the old fp. We know OLD-FP is going to be in its stack - ;; save slot, which is a different frame that than this one, - ;; so we don't have to worry about having just cleared - ;; most of the stack. - (move rbp-tn old-fp) - (inst jmp rpc) - (trace-table-entry trace-table-normal))) - ;;; From Douglas Crosher ;;; Return from known values call. We receive the return locations as ;;; arguments to terminate their lifetimes in the returning function. We ;;; restore FP and CSP and jump to the Return-PC. -;;; -;;; The old-fp may be either in a register or on the stack in its -;;; standard save locations - slot 0. -;;; -;;; The return-pc may be in a register or on the stack in any slot. (define-vop (known-return) (:args (old-fp) (return-pc) @@ -618,27 +596,12 @@ (:ignore val-locs vals) (:vop-var vop) (:generator 6 + (check-ocfp-and-return-pc old-fp return-pc) (trace-table-entry trace-table-fun-epilogue) - ;; return-pc may be either in a register or on the stack. - (sc-case return-pc - ((sap-stack) - (unless (and (sc-is old-fp control-stack) - (= (tn-offset old-fp) ocfp-save-offset)) - (error "known-return: ocfp not on stack in standard save location?")) - (unless (and (sc-is return-pc sap-stack) - (= (tn-offset return-pc) return-pc-save-offset)) - (error - "known-return: return-pc not on stack in standard save location?")) - - ;; Zot all of the stack except for the old-fp and return-pc. - (inst lea rsp-tn - (make-ea :qword :base rbp-tn - :disp (frame-byte-offset ocfp-save-offset))) - (inst pop rbp-tn) - (inst ret (* (tn-offset return-pc) n-word-bytes))) - (t - (error "known-return, return-pc not on stack"))) - + ;; Zot all of the stack except for the old-fp and return-pc. + (inst mov rsp-tn rbp-tn) + (inst pop rbp-tn) + (inst ret) (trace-table-entry trace-table-normal))) ;;;; full call @@ -750,6 +713,8 @@ :from (:argument 1) :to (:argument 2)) old-fp-tmp))) + ,@(unless (eq return :tail) + '((:node-var node))) (:generator ,(+ (if named 5 0) (if variable 19 1) @@ -838,6 +803,10 @@ ,(if variable '(inst sub rsp-tn (fixnumize 3))) + ;; Bias the new-fp for use as an fp + ,(if variable + '(inst sub new-fp (fixnumize sp->fp-offset))) + ;; Save the fp (storew rbp-tn new-fp (frame-word-offset ocfp-save-offset)) @@ -863,10 +832,11 @@ fun-pointer-lowtag)))) ,@(ecase return (:fixed - '((default-unknown-values vop values nvals))) + '((default-unknown-values vop values nvals node))) (:unknown '((note-this-location vop :unknown-return) - (receive-unknown-values values-start nvals start count))) + (receive-unknown-values values-start nvals start count + node))) (:tail)) (trace-table-entry trace-table-normal))))) @@ -887,30 +857,19 @@ (:args (args :scs (any-reg control-stack) :target rsi) (function :scs (descriptor-reg control-stack) :target rax) (old-fp) - (ret-addr)) + (return-pc)) (:temporary (:sc unsigned-reg :offset rsi-offset :from (:argument 0)) rsi) (:temporary (:sc unsigned-reg :offset rax-offset :from (:argument 1)) rax) (:temporary (:sc unsigned-reg) call-target) -; (:ignore ret-addr old-fp) (:generator 75 + (check-ocfp-and-return-pc old-fp return-pc) ;; Move these into the passing locations if they are not already there. (move rsi args) (move rax function) - - ;; The following assumes that the return-pc and old-fp are on the - ;; stack in their standard save locations - Check this. - (unless (and (sc-is old-fp control-stack) - (= (tn-offset old-fp) ocfp-save-offset)) - (error "tail-call-variable: ocfp not on stack in standard save location?")) - (unless (and (sc-is ret-addr sap-stack) - (= (tn-offset ret-addr) return-pc-save-offset)) - (error "tail-call-variable: ret-addr not on stack in standard save location?")) - - + ;; And jump to the assembly routine. (inst lea call-target (make-ea :qword :disp (make-fixup 'tail-call-variable :assembly-routine))) - ;; And jump to the assembly routine. (inst jmp call-target))) ;;;; unknown values return @@ -930,34 +889,16 @@ (value)) (:ignore value) (:generator 6 + (check-ocfp-and-return-pc old-fp return-pc) (trace-table-entry trace-table-fun-epilogue) - ;; Code structure lifted from known-return. - (sc-case return-pc - ((sap-stack) - ;; Note that this will only work right if, when old-fp is on - ;; the stack, it has a lower tn-offset than return-pc. One of - ;; the comments in known-return indicate that this is the case - ;; (in that it will be in its save location), but we may wish - ;; to assert that (in either the weaker or stronger forms). - ;; Should this ever not be the case, we should load old-fp into - ;; a temp reg while we fix the stack. - (unless (and (sc-is old-fp control-stack) - (= (tn-offset old-fp) ocfp-save-offset)) - (error "ocfp not on stack in standard save location?")) - (unless (and (sc-is return-pc sap-stack) - (= (tn-offset return-pc) return-pc-save-offset)) - (error "return-pc not on stack in standard save location?")) - ;; Drop stack above old-fp - (inst lea rsp-tn (make-ea :qword :base rbp-tn - :disp (frame-byte-offset (tn-offset old-fp)))) - ;; Set single-value return flag - (inst clc) - ;; Restore the old frame pointer - (inst pop rbp-tn) - ;; And return, dropping the rest of the stack as we go. - (inst ret (* (tn-offset return-pc) n-word-bytes))) - (t - (error "return pc not on stack"))))) + ;; Drop stack above old-fp + (inst mov rsp-tn rbp-tn) + ;; Clear the multiple-value return flag + (inst clc) + ;; Restore the old frame pointer + (inst pop rbp-tn) + ;; And return. + (inst ret))) ;;; Do unknown-values return of a fixed (other than 1) number of ;;; values. The VALUES are required to be set up in the standard @@ -972,12 +913,10 @@ (values :more t)) (:ignore values) (:info nvals) - ;; In the case of other than one value, we need these registers to ;; tell the caller where they are and how many there are. (:temporary (:sc unsigned-reg :offset rbx-offset) rbx) (:temporary (:sc unsigned-reg :offset rcx-offset) rcx) - ;; We need to stretch the lifetime of return-pc past the argument ;; registers so that we can default the argument registers without ;; trashing return-pc. @@ -989,20 +928,17 @@ :from :eval) a2) (:generator 6 + (check-ocfp-and-return-pc old-fp return-pc) + (when (= nvals 1) + ;; This is handled in RETURN-SINGLE. + (error "nvalues is 1")) (trace-table-entry trace-table-fun-epilogue) ;; Establish the values pointer and values count. - (move rbx rbp-tn) + (inst lea rbx (make-ea :qword :base rbp-tn + :disp (* sp->fp-offset n-word-bytes))) (if (zerop nvals) (zeroize rcx) ; smaller - (inst mov rcx (fixnumize nvals))) - ;; Restore the frame pointer. - (move rbp-tn old-fp) - ;; Clear as much of the stack as possible, but not past the return - ;; address. - (inst lea rsp-tn - (make-ea :qword :base rbx - :disp (frame-byte-offset (max (1- nvals) - return-pc-save-offset)))) + (inst mov rcx (fixnumize nvals))) ;; Pre-default any argument register that need it. (when (< nvals register-arg-count) (let* ((arg-tns (nthcdr nvals (list a0 a1 a2))) @@ -1015,17 +951,25 @@ ;; And away we go. Except that return-pc is still on the ;; stack and we've changed the stack pointer. So we have to ;; tell it to index off of RBX instead of RBP. - (cond ((zerop nvals) - ;; Return popping the return address and what's earlier in - ;; the frame. - (inst ret (* return-pc-save-offset n-word-bytes))) - ((= nvals 1) - ;; This is handled in RETURN-SINGLE. - (error "nvalues is 1")) + (cond ((<= nvals register-arg-count) + (inst mov rsp-tn rbp-tn) + (inst pop rbp-tn) + (inst ret)) (t - ;; Thou shalt not JMP unto thy return address. + ;; Some values are on the stack after RETURN-PC and OLD-FP, + ;; can't return normally and some slots of the frame will + ;; be used as temporaries by the receiver. + ;; + ;; Clear as much of the stack as possible, but not past the + ;; old frame address. + (inst lea rsp-tn + (make-ea :qword :base rbp-tn + :disp (frame-byte-offset (1- nvals)))) + (move rbp-tn old-fp) (inst push (make-ea :qword :base rbx - :disp (frame-byte-offset (tn-offset return-pc)))) + :disp (frame-byte-offset + (+ sp->fp-offset + (tn-offset return-pc))))) (inst ret))) (trace-table-entry trace-table-normal))) @@ -1037,54 +981,40 @@ ;;; assembly-routine. ;;; ;;; The assembly routine takes the following args: -;;; RAX -- the return-pc to finally jump to. -;;; RBX -- pointer to where to put the values. ;;; RCX -- number of values to find there. ;;; RSI -- pointer to where to find the values. (define-vop (return-multiple) - (:args (old-fp :to (:eval 1) :target old-fp-temp) - (return-pc :target rax) + (:args (old-fp) + (return-pc) (vals :scs (any-reg) :target rsi) (nvals :scs (any-reg) :target rcx)) - - (:temporary (:sc unsigned-reg :offset rax-offset :from (:argument 1)) rax) (:temporary (:sc unsigned-reg :offset rsi-offset :from (:argument 2)) rsi) (:temporary (:sc unsigned-reg :offset rcx-offset :from (:argument 3)) rcx) - (:temporary (:sc unsigned-reg :offset rbx-offset :from (:eval 0)) rbx) (:temporary (:sc unsigned-reg) return-asm) (:temporary (:sc descriptor-reg :offset (first *register-arg-offsets*) :from (:eval 0)) a0) - (:temporary (:sc unsigned-reg :from (:eval 1)) old-fp-temp) (:node-var node) - (:generator 13 + (check-ocfp-and-return-pc old-fp return-pc) (trace-table-entry trace-table-fun-epilogue) - ;; Load the return-pc. - (move rax return-pc) (unless (policy node (> space speed)) ;; Check for the single case. (let ((not-single (gen-label))) (inst cmp nvals (fixnumize 1)) (inst jmp :ne not-single) - ;; Return with one value. (loadw a0 vals -1) - ;; Clear the stack. We load old-fp into a register before clearing - ;; the stack. - (move old-fp-temp old-fp) - (move rsp-tn rbp-tn) - (move rbp-tn old-fp-temp) + ;; Clear the stack until ocfp. + (inst mov rsp-tn rbp-tn) ;; clear the multiple-value return flag (inst clc) ;; Out of here. - (inst push rax) + (inst pop rbp-tn) (inst ret) ;; Nope, not the single case. Jump to the assembly routine. (emit-label not-single))) (move rsi vals) (move rcx nvals) - (move rbx rbp-tn) - (move rbp-tn old-fp) (inst lea return-asm (make-ea :qword :disp (make-fixup 'return-multiple :assembly-routine))) @@ -1126,11 +1056,11 @@ (inst jmp :be JUST-ALLOC-FRAME))) ;; Allocate the space on the stack. - ;; stack = rbp - (max 3 frame-size) - (nargs - fixed) + ;; stack = rbp + sp->fp-offset - (max 3 frame-size) - (nargs - fixed) (inst lea rbx-tn (make-ea :qword :base rbp-tn - :disp (- (fixnumize fixed) - (* n-word-bytes + :disp (* n-word-bytes + (- (+ sp->fp-offset fixed) (max 3 (sb-allocated-size 'stack)))))) (inst sub rbx-tn rcx-tn) ; Got the new stack in rbx (inst mov rsp-tn rbx-tn) @@ -1152,7 +1082,8 @@ (inst sub rcx-tn (fixnumize fixed)))) ;; Initialize R8 to be the end of args. - (inst mov source rbp-tn) + (inst lea source (make-ea :qword :base rbp-tn + :disp (* sp->fp-offset n-word-bytes))) (inst sub source rbx-tn) ;; We need to copy from downwards up to avoid overwriting some of @@ -1182,9 +1113,12 @@ ( nil ) ;; Store it relative to rbp (inst mov (make-ea :qword :base rbp-tn - :disp (- (* n-word-bytes - (+ 1 (- i fixed) - (max 3 (sb-allocated-size 'stack)))))) + :disp (* n-word-bytes + (- sp->fp-offset + (+ 1 + (- i fixed) + (max 3 (sb-allocated-size + 'stack)))))) (nth i *register-arg-tns*)) (incf i) @@ -1202,7 +1136,8 @@ JUST-ALLOC-FRAME (inst lea rsp-tn (make-ea :qword :base rbp-tn - :disp (- (* n-word-bytes + :disp (* n-word-bytes + (- sp->fp-offset (max 3 (sb-allocated-size 'stack)))))) DONE)) @@ -1260,7 +1195,6 @@ (inst lea dst (make-ea :qword :base rcx :index rcx)) (maybe-pseudo-atomic stack-allocate-p (allocation dst dst node stack-allocate-p list-pointer-lowtag) - (inst shr rcx (1- n-lowtag-bits)) ;; Set decrement mode (successive args at lower addresses) (inst std) ;; Set up the result. @@ -1275,10 +1209,11 @@ (storew dst dst -1 list-pointer-lowtag) (emit-label enter) ;; Grab one value and stash it in the car of this cons. - (inst lods rax) + (inst mov rax (make-ea :qword :base src)) + (inst sub src n-word-bytes) (storew rax dst 0 list-pointer-lowtag) ;; Go back for more. - (inst sub rcx 1) + (inst sub rcx n-word-bytes) (inst jmp :nz loop) ;; NIL out the last cons. (storew nil-value dst 1 list-pointer-lowtag)