X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fcall.lisp;h=72936a35c3edc0c08c2d8b642d241ecae4f6b604;hb=a32e302e869993d89fd9c247d4f038fcc7dfdac9;hp=fa0c1630d7a7bdfcd90d7584645291424caa12f4;hpb=66955b341a6d13dc2c2efde8739308b7cfc7e164;p=sbcl.git diff --git a/src/compiler/x86/call.lisp b/src/compiler/x86/call.lisp index fa0c163..72936a3 100644 --- a/src/compiler/x86/call.lisp +++ b/src/compiler/x86/call.lisp @@ -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) @@ -470,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. ;;; @@ -498,33 +661,13 @@ (: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 + (inst call target) (default-unknown-values vop values nvals node) (trace-table-entry trace-table-normal))) @@ -538,33 +681,14 @@ (: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 node) (trace-table-entry trace-table-normal))) @@ -585,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))) @@ -1253,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. @@ -1271,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)