X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fcall.lisp;h=e0609214baac7a2a1fe98d9c573dc00f207c8905;hb=74cf7a4d01664fbf72a662ba093ad67ca243b524;hp=4d54c918040896398776cf6a358c8a29c08a97f5;hpb=952d16ab5880823c1864eb9105bb269e2e00760d;p=sbcl.git diff --git a/src/compiler/x86/call.lisp b/src/compiler/x86/call.lisp index 4d54c91..e060921 100644 --- a/src/compiler/x86/call.lisp +++ b/src/compiler/x86/call.lisp @@ -15,7 +15,7 @@ ;;; Return a wired TN describing the N'th full call argument passing ;;; location. -(!def-vm-support-routine standard-arg-location (n) +(defun standard-arg-location (n) (declare (type unsigned-byte n)) (if (< n register-arg-count) (make-wired-tn *backend-t-primitive-type* descriptor-reg-sc-number @@ -26,7 +26,7 @@ ;;; ;;; Always wire the return PC location to the stack in its standard ;;; location. -(!def-vm-support-routine make-return-pc-passing-location (standard) +(defun make-return-pc-passing-location (standard) (declare (ignore standard)) (make-wired-tn (primitive-type-or-lose 'system-area-pointer) sap-stack-sc-number return-pc-save-offset)) @@ -38,7 +38,7 @@ ;;; because we want to be able to assume it's always there. Besides, ;;; the x86 doesn't have enough registers to really make it profitable ;;; to pass it in a register. -(!def-vm-support-routine make-old-fp-passing-location (standard) +(defun make-old-fp-passing-location (standard) (declare (ignore standard)) (make-wired-tn *fixnum-primitive-type* control-stack-sc-number ocfp-save-offset)) @@ -49,12 +49,12 @@ ;;; ;;; Without using a save-tn - which does not make much sense if it is ;;; wired to the stack? -(!def-vm-support-routine make-old-fp-save-location (physenv) +(defun make-old-fp-save-location (physenv) (physenv-debug-live-tn (make-wired-tn *fixnum-primitive-type* control-stack-sc-number ocfp-save-offset) physenv)) -(!def-vm-support-routine make-return-pc-save-location (physenv) +(defun make-return-pc-save-location (physenv) (physenv-debug-live-tn (make-wired-tn (primitive-type-or-lose 'system-area-pointer) sap-stack-sc-number return-pc-save-offset) @@ -63,23 +63,23 @@ ;;; Make a TN for the standard argument count passing location. We only ;;; need to make the standard location, since a count is never passed when we ;;; are using non-standard conventions. -(!def-vm-support-routine make-arg-count-location () +(defun make-arg-count-location () (make-wired-tn *fixnum-primitive-type* any-reg-sc-number ecx-offset)) ;;; Make a TN to hold the number-stack frame pointer. This is allocated ;;; once per component, and is component-live. -(!def-vm-support-routine make-nfp-tn () +(defun make-nfp-tn () (make-restricted-tn *fixnum-primitive-type* ignore-me-sc-number)) -(!def-vm-support-routine make-stack-pointer-tn () +(defun make-stack-pointer-tn () (make-normal-tn *fixnum-primitive-type*)) -(!def-vm-support-routine make-number-stack-pointer-tn () +(defun make-number-stack-pointer-tn () (make-restricted-tn *fixnum-primitive-type* ignore-me-sc-number)) ;;; Return a list of TNs that can be used to represent an unknown-values ;;; continuation within a function. -(!def-vm-support-routine make-unknown-values-locations () +(defun make-unknown-values-locations () (list (make-stack-pointer-tn) (make-normal-tn *fixnum-primitive-type*))) @@ -87,7 +87,7 @@ ;;; VM-dependent initialization of the IR2-COMPONENT structure. We ;;; push placeholder entries in the CONSTANTS to leave room for ;;; additional noise in the code object header. -(!def-vm-support-routine select-component-format (component) +(defun select-component-format (component) (declare (type component component)) ;; The 1+ here is because for the x86 the first constant is a ;; pointer to a list of fixups, or NIL if the code object has none. @@ -119,6 +119,157 @@ (: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))))) + +(macrolet ((define-frame-op + (suffix sc stack-sc instruction + &optional (ea + `(make-ea :dword + :base frame-pointer + :disp (frame-byte-offset + (tn-offset variable-home-tn))))) + (let ((reffer (symbolicate 'ancestor-frame-ref '/ suffix)) + (setter (symbolicate 'ancestor-frame-set '/ suffix))) + `(progn + (define-vop (,reffer ancestor-frame-ref) + (:results (value :scs (,sc))) + (:generator 4 + (aver (sc-is variable-home-tn ,stack-sc)) + (inst ,instruction value + ,ea))) + (define-vop (,setter ancestor-frame-set) + (:args (frame-pointer :scs (descriptor-reg)) + (value :scs (,sc))) + (:generator 4 + (aver (sc-is variable-home-tn ,stack-sc)) + (inst ,instruction ,ea value)))))) + (define-x87-frame-op + (suffix sc stack-sc (load set) + &optional (ea + `(make-ea :dword + :base frame-pointer + :disp (frame-byte-offset + (tn-offset variable-home-tn))))) + (let ((reffer (symbolicate 'ancestor-frame-ref '/ suffix)) + (setter (symbolicate 'ancestor-frame-set '/ suffix))) + `(progn + (define-vop (,reffer ancestor-frame-ref) + (:results (value :scs (,sc))) + (:generator 4 + (aver (sc-is variable-home-tn ,stack-sc)) + ,(if (symbolp load) + `(with-empty-tn@fp-top (value) + (inst ,load ,ea)) + load))) + (define-vop (,setter ancestor-frame-set) + (:args (frame-pointer :scs (descriptor-reg)) + (value :scs (,sc))) + (:generator 4 + (aver (sc-is variable-home-tn ,stack-sc)) + ,(if (symbolp set) + `(with-tn@fp-top (value) + (inst ,set ,ea)) + set))))))) + (define-frame-op signed-byte-32 signed-reg signed-stack mov) + (define-frame-op unsigned-byte-32 unsigned-reg unsigned-stack mov) + (define-frame-op system-area-pointer sap-reg sap-stack mov) + + (define-x87-frame-op double-float double-reg double-stack + (fldd fstd) (make-ea :dword + :base frame-pointer + :disp (frame-byte-offset + (1+ (tn-offset variable-home-tn))))) + (define-x87-frame-op single-float single-reg single-stack + (fld fst)) + + (define-x87-frame-op complex-double-float complex-double-reg + complex-double-stack + ((let ((real (complex-double-reg-real-tn value)) + (imag (complex-double-reg-imag-tn value))) + (with-empty-tn@fp-top (real) + (inst fldd (ea-for-cdf-real-stack variable-home-tn frame-pointer))) + (with-empty-tn@fp-top (imag) + (inst fldd (ea-for-cdf-imag-stack variable-home-tn frame-pointer)))) + (let ((real (complex-double-reg-real-tn value)) + (imag (complex-double-reg-imag-tn value))) + (with-tn@fp-top (real) + (inst fstd (ea-for-cdf-real-stack variable-home-tn frame-pointer))) + (with-tn@fp-top (imag) + (inst fstd (ea-for-cdf-imag-stack variable-home-tn frame-pointer)))))) + (define-x87-frame-op complex-single-float complex-single-reg + complex-single-stack + ((let ((real (complex-single-reg-real-tn value)) + (imag (complex-single-reg-imag-tn value))) + (with-empty-tn@fp-top (real) + (inst fld (ea-for-csf-real-stack variable-home-tn frame-pointer))) + (with-empty-tn@fp-top (imag) + (inst fld (ea-for-csf-imag-stack variable-home-tn frame-pointer)))) + (let ((real (complex-single-reg-real-tn value)) + (imag (complex-single-reg-imag-tn value))) + (with-tn@fp-top (real) + (inst fst (ea-for-csf-real-stack variable-home-tn frame-pointer))) + (with-tn@fp-top (imag) + (inst fst (ea-for-csf-imag-stack variable-home-tn frame-pointer))))))) + +(defun primitive-type-indirect-cell-type (ptype) + (declare (type primitive-type ptype)) + (macrolet ((foo (&body data) + `(case (primitive-type-name ptype) + ,@(loop for (name stack-sc ref set) in data + collect + `(,name + (load-time-value + (list (primitive-type-or-lose ',name) + (sc-or-lose ',stack-sc) + (lambda (node block fp value res) + (sb!c::vop ,ref node block + fp value res)) + (lambda (node block fp new-val value) + (sb!c::vop ,set node block + fp new-val value))))))))) + (foo (double-float double-stack + ancestor-frame-ref/double-float + ancestor-frame-set/double-float) + (single-float single-stack + ancestor-frame-ref/single-float + ancestor-frame-set/single-float) + (complex-double-float complex-double-stack + ancestor-frame-ref/complex-double-float + ancestor-frame-set/complex-double-float) + (complex-single-float complex-single-stack + ancestor-frame-ref/complex-single-float + ancestor-frame-set/complex-single-float) + (signed-byte-32 signed-stack + ancestor-frame-ref/signed-byte-32 + ancestor-frame-set/signed-byte-32) + (unsigned-byte-32 unsigned-stack + ancestor-frame-ref/unsigned-byte-32 + ancestor-frame-set/unsigned-byte-32) + (unsigned-byte-31 unsigned-stack + ancestor-frame-ref/unsigned-byte-32 + ancestor-frame-set/unsigned-byte-32) + (system-area-pointer sap-stack + ancestor-frame-ref/system-area-pointer + ancestor-frame-set/system-area-pointer)))) + (define-vop (xep-allocate-frame) (:info start-lab copy-more-arg-follows) (:vop-var vop) @@ -191,189 +342,195 @@ ;;; 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) + (let ((type (sb!c::basic-combination-derived-type node))) (cond - ((member :cmov *backend-subfeatures*) - (inst cmov :c esp-tn ebx-tn)) + ((<= 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 esp-tn ebx-tn)) + ((member :cmov *backend-subfeatures*) + (inst cmov :c esp-tn ebx-tn)) + (t + (let ((single-value (gen-label))) + (inst jmp :nc single-value) + (inst mov esp-tn ebx-tn) + (emit-label single-value))))) + ((<= 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 ebx-tn esp-tn) + (emit-label regs-defaulted))) + (when (< register-arg-count + (sb!kernel:values-type-max-value-count type)) + (inst mov esp-tn ebx-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 eax-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) eax-tn)) + ;; Fake other registers so it looks like we returned with all the + ;; registers filled in. + (move ebx-tn esp-tn) + (inst jmp default-stack-slots) + (emit-label regs-defaulted) + (inst mov eax-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 ecx-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 EDX in its first slot temporalily. + (storew edx-tn ebx-tn (frame-word-offset sp->fp-offset))) + (loadw edx-tn ebx-tn (frame-word-offset (+ sp->fp-offset i))) + (inst mov tn edx-tn))) + (emit-label defaulting-done) + (loadw edx-tn ebx-tn (frame-word-offset sp->fp-offset)) + (move esp-tn ebx-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 EDX by + ;; pushing it to the stack, it will end up at same + ;; place as in the (STOREW EDX-TN EBX-TN -1) case + ;; above. + (inst push edx-tn)) + (inst mov (second default) eax-tn)) + (inst jmp defaulting-done) + (trace-table-entry trace-table-normal))))))) (t - (let ((single-value (gen-label))) - (inst jmp :nc single-value) + ;; 91 bytes for this branch. + (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 ebx-tn esp-tn) + (inst mov edi-tn nil-value) + (inst mov esi-tn edi-tn) + ;; Compute a pointer to where to put the [defaulted] stack values. + (emit-label no-stack-args) + (inst push edx-tn) + (inst push edi-tn) + (inst lea edi-tn + (make-ea :dword :base ebp-tn + :disp (frame-byte-offset register-arg-count))) + ;; Load EAX with NIL so we can quickly store it, and set up + ;; stuff for the loop. + (inst mov eax-tn nil-value) + (inst std) + (inst mov ecx-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 ecx-tn (fixnumize register-arg-count)) + (inst jmp :le no-stack-args) + ;; Save EDI. + (storew edi-tn ebx-tn (frame-word-offset (+ sp->fp-offset 1))) + ;; Throw away any unwanted args. + (inst cmp ecx-tn (fixnumize (- nvals register-arg-count))) + (inst jmp :be count-okay) + (inst mov ecx-tn (fixnumize (- nvals register-arg-count))) + (emit-label count-okay) + ;; Save the number of stack values. + (inst mov eax-tn ecx-tn) + ;; Compute a pointer to where the stack args go. + (inst lea edi-tn + (make-ea :dword :base ebp-tn + :disp (frame-byte-offset register-arg-count))) + ;; Save ESI, and compute a pointer to where the args come from. + (storew esi-tn ebx-tn (frame-word-offset (+ sp->fp-offset 2))) + (inst lea esi-tn + (make-ea :dword :base ebx-tn + :disp (frame-byte-offset + (+ sp->fp-offset register-arg-count)))) + ;; Do the copy. + (inst shr ecx-tn word-shift) ; make word count + (inst std) + (inst rep) + (inst movs :dword) + ;; Restore ESI. + (loadw esi-tn ebx-tn (frame-word-offset (+ sp->fp-offset 2))) + ;; Now we have to default the remaining args. Find out how many. + (inst sub eax-tn (fixnumize (- nvals register-arg-count))) + (inst neg eax-tn) + ;; If none, then just blow out of here. + (inst jmp :le restore-edi) + (inst mov ecx-tn eax-tn) + (inst shr ecx-tn word-shift) ; word count + ;; Load EAX with NIL for fast storing. + (inst mov eax-tn nil-value) + ;; Do the store. + (emit-label default-stack-vals) + (inst rep) + (inst stos eax-tn) + ;; Restore EDI, and reset the stack. + (emit-label restore-edi) + (loadw edi-tn ebx-tn (frame-word-offset (+ sp->fp-offset 1))) (inst mov esp-tn ebx-tn) - (emit-label single-value))))) - ((<= 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 ebx-tn esp-tn) - (emit-label regs-defaulted) - (inst mov esp-tn ebx-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 eax-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) eax-tn)) - - ;; Fake other registers so it looks like we returned with all the - ;; registers filled in. - (move ebx-tn esp-tn) - (inst jmp default-stack-slots) - - (emit-label regs-defaulted) - - (inst mov eax-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 ecx-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 EDX in its first slot temporalily. - (storew edx-tn ebx-tn (frame-word-offset sp->fp-offset))) - (loadw edx-tn ebx-tn (frame-word-offset (+ sp->fp-offset i))) - (inst mov tn edx-tn))) - - (emit-label defaulting-done) - (loadw edx-tn ebx-tn (frame-word-offset sp->fp-offset)) - (move esp-tn ebx-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 EDX by - ;; pushing it to the stack, it will end up at same - ;; place as in the (STOREW EDX-TN EBX-TN -1) case - ;; above. - (inst push edx-tn)) - (inst mov (second default) eax-tn)) - (inst jmp defaulting-done) - (trace-table-entry trace-table-normal))))))) - (t - ;; 91 bytes for this branch. - (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 ebx-tn esp-tn) - (inst mov edi-tn nil-value) - (inst mov esi-tn edi-tn) - ;; Compute a pointer to where to put the [defaulted] stack values. - (emit-label no-stack-args) - (inst push edx-tn) - (inst push edi-tn) - (inst lea edi-tn - (make-ea :dword :base ebp-tn - :disp (frame-byte-offset register-arg-count))) - ;; Load EAX with NIL so we can quickly store it, and set up - ;; stuff for the loop. - (inst mov eax-tn nil-value) - (inst std) - (inst mov ecx-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 edi-tn ebx-tn (frame-word-offset (+ sp->fp-offset 1))) - ;; Compute the number of stack arguments, and if it's zero or - ;; less, don't copy any stack arguments. - (inst sub ecx-tn (fixnumize register-arg-count)) - (inst jmp :le no-stack-args) - - ;; Throw away any unwanted args. - (inst cmp ecx-tn (fixnumize (- nvals register-arg-count))) - (inst jmp :be count-okay) - (inst mov ecx-tn (fixnumize (- nvals register-arg-count))) - (emit-label count-okay) - ;; Save the number of stack values. - (inst mov eax-tn ecx-tn) - ;; Compute a pointer to where the stack args go. - (inst lea edi-tn - (make-ea :dword :base ebp-tn - :disp (frame-byte-offset register-arg-count))) - ;; Save ESI, and compute a pointer to where the args come from. - (storew esi-tn ebx-tn (frame-word-offset (+ sp->fp-offset 2))) - (inst lea esi-tn - (make-ea :dword :base ebx-tn - :disp (frame-byte-offset - (+ sp->fp-offset register-arg-count)))) - ;; Do the copy. - (inst shr ecx-tn word-shift) ; make word count - (inst std) - (inst rep) - (inst movs :dword) - ;; Restore ESI. - (loadw esi-tn ebx-tn (frame-word-offset (+ sp->fp-offset 2))) - ;; Now we have to default the remaining args. Find out how many. - (inst sub eax-tn (fixnumize (- nvals register-arg-count))) - (inst neg eax-tn) - ;; If none, then just blow out of here. - (inst jmp :le restore-edi) - (inst mov ecx-tn eax-tn) - (inst shr ecx-tn word-shift) ; word count - ;; Load EAX with NIL for fast storing. - (inst mov eax-tn nil-value) - ;; Do the store. - (emit-label default-stack-vals) - (inst rep) - (inst stos eax-tn) - ;; Restore EDI, and reset the stack. - (emit-label restore-edi) - (loadw edi-tn ebx-tn (frame-word-offset (+ sp->fp-offset 1))) - (inst mov esp-tn ebx-tn) - (inst cld)))) + (inst cld))))) (values)) ;;;; unknown values receiving @@ -395,34 +552,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 :dword :base esp-tn :disp n-word-bytes))) - (t (inst mov start esp-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 :dword :base esp-tn :disp n-word-bytes))) + (t (inst mov start esp-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. - (inst cmp nargs (fixnumize register-arg-count)) - (inst jmp :g stack-values) - (inst sub esp-tn nargs) - (emit-label stack-values) + (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 esp-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 ecx 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) @@ -461,6 +621,18 @@ (= (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) + (declare (ignore alignp)) + (when trampoline-label + (when fall-thru-p + (inst jmp start-label)) + (emit-label trampoline-label) + (popw ebp-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. ;;; @@ -489,33 +661,14 @@ (: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 ebp-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)) - (storew (make-fixup nil :code-object RETURN) - ebp-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 @@ -528,34 +681,16 @@ (: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 ebp-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 - (storew (make-fixup nil :code-object RETURN) - ebp-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 @@ -574,33 +709,13 @@ (: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 ebp-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 - (storew (make-fixup nil :code-object RETURN) - ebp-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))) @@ -734,6 +849,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) @@ -849,10 +966,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))))) @@ -1058,7 +1176,7 @@ ;;; ;;; EAX -- The lexenv. ;;; EBX -- Available. -;;; ECX -- The total number of arguments. +;;; ECX -- The total number of arguments * N-WORD-BYTES. ;;; EDX -- The first arg. ;;; EDI -- The second arg. ;;; ESI -- The third arg. @@ -1239,7 +1357,6 @@ (inst lea dst (make-ea :dword :base ecx :index ecx)) (maybe-pseudo-atomic stack-allocate-p (allocation dst dst node stack-allocate-p list-pointer-lowtag) - (inst shr ecx (1- n-lowtag-bits)) ;; Set decrement mode (successive args at lower addresses) (inst std) ;; Set up the result. @@ -1257,7 +1374,7 @@ (inst lods eax) (storew eax dst 0 list-pointer-lowtag) ;; Go back for more. - (inst sub ecx 1) + (inst sub ecx n-word-bytes) (inst jmp :nz loop) ;; NIL out the last cons. (storew nil-value dst 1 list-pointer-lowtag) @@ -1348,9 +1465,12 @@ ;; register on -SB-THREAD. #!+sb-thread (progn - (inst cmp (make-ea :dword - :disp (* thread-stepping-slot n-word-bytes)) - nil-value :fs)) + #!+win32 (inst push eax-tn) + (with-tls-ea (EA :base #!+win32 eax-tn #!-win32 :unused + :disp-type :constant + :disp (* thread-stepping-slot n-word-bytes)) + (inst cmp EA nil-value :maybe-fs)) + #!+win32 (inst pop eax-tn)) #!-sb-thread (inst cmp (make-ea-for-symbol-value sb!impl::*stepping*) nil-value))