X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fnlx.lisp;h=2c24331baf2ab65a6f1048c3169adc6492bd016e;hb=12b1dae1a1ed90c6ffe4d958f1281c1c04a8e89b;hp=faf7c6576c42bdbbb3d0f618133d3742060965f3;hpb=a6c61ba848e9ed11118b6fb579fe237d0b1cf9c6;p=sbcl.git diff --git a/src/compiler/x86/nlx.lisp b/src/compiler/x86/nlx.lisp index faf7c65..2c24331 100644 --- a/src/compiler/x86/nlx.lisp +++ b/src/compiler/x86/nlx.lisp @@ -12,13 +12,13 @@ (in-package "SB!VM") ;;; Make an environment-live stack TN for saving the SP for NLX entry. -(!def-vm-support-routine make-nlx-sp-tn (env) +(defun make-nlx-sp-tn (env) (physenv-live-tn (make-representation-tn *fixnum-primitive-type* any-reg-sc-number) env)) ;;; Make a TN for the argument count passing location for a non-local entry. -(!def-vm-support-routine make-nlx-entry-arg-start-location () +(defun make-nlx-entry-arg-start-location () (make-wired-tn *fixnum-primitive-type* any-reg-sc-number ebx-offset)) (defun catch-block-ea (tn) @@ -83,8 +83,7 @@ block catch-block-entry-pc-slot) #!+win32 (progn - (inst fs-segment-prefix) - (inst mov temp (make-ea :dword :disp 0)) + (inst mov temp (make-ea :dword :disp 0) :fs) (storew temp block unwind-block-next-seh-frame-slot)))) ;;; like MAKE-UNWIND-BLOCK, except that we also store in the specified @@ -104,8 +103,7 @@ block catch-block-entry-pc-slot) #!+win32 (progn - (inst fs-segment-prefix) - (inst mov temp (make-ea :dword :disp 0)) + (inst mov temp (make-ea :dword :disp 0) :fs) (storew temp block unwind-block-next-seh-frame-slot)) (storew tag block catch-block-tag-slot) (load-tl-symbol-value temp *current-catch-block*) @@ -126,8 +124,7 @@ (inst lea seh-frame (make-ea-for-object-slot new-uwp unwind-block-next-seh-frame-slot 0)) - (inst fs-segment-prefix) - (inst mov (make-ea :dword :disp 0) seh-frame)) + (inst mov (make-ea :dword :disp 0) seh-frame :fs)) (store-tl-symbol-value new-uwp *current-unwind-protect-block* tls))) (define-vop (unlink-catch-block) @@ -149,8 +146,7 @@ #!+win32 (progn (loadw seh-frame block unwind-block-next-seh-frame-slot) - (inst fs-segment-prefix) - (inst mov (make-ea :dword :disp 0) seh-frame)) + (inst mov (make-ea :dword :disp 0) seh-frame :fs)) (loadw block block unwind-block-current-uwp-slot) (store-tl-symbol-value block *current-unwind-protect-block* tls))) @@ -177,28 +173,35 @@ (loadw (tn-ref-tn values) start -1) (emit-label no-values))) (t + ;; FIXME: this is mostly copied from + ;; DEFAULT-UNKNOWN-VALUES. (collect ((defaults)) (do ((i 0 (1+ i)) (tn-ref values (tn-ref-across tn-ref))) ((null tn-ref)) (let ((default-lab (gen-label)) - (tn (tn-ref-tn tn-ref))) - (defaults (cons default-lab tn)) - + (tn (tn-ref-tn tn-ref)) + (first-stack-arg-p (= i register-arg-count))) + (defaults (cons default-lab (cons tn first-stack-arg-p))) (inst cmp count (fixnumize i)) (inst jmp :le default-lab) + (when first-stack-arg-p + (storew edx-tn ebx-tn -1)) (sc-case tn ((descriptor-reg any-reg) - (loadw tn start (frame-word-offset i))) + (loadw tn start (frame-word-offset (+ sp->fp-offset i)))) ((control-stack) - (loadw move-temp start (frame-word-offset i)) + (loadw move-temp start + (frame-word-offset (+ sp->fp-offset i))) (inst mov tn move-temp))))) (let ((defaulting-done (gen-label))) (emit-label defaulting-done) (assemble (*elsewhere*) - (dolist (def (defaults)) - (emit-label (car def)) - (inst mov (cdr def) nil-value)) + (dolist (default (defaults)) + (emit-label (car default)) + (when (cddr default) + (inst push edx-tn)) + (inst mov (second default) nil-value)) (inst jmp defaulting-done)))))) (inst mov esp-tn sp))) @@ -232,12 +235,12 @@ (move num ecx) (inst shr ecx word-shift) ; word count for ;; If we got zero, we be done. - (inst jecxz done) + (inst jecxz DONE) ;; Copy them down. (inst std) (inst rep) (inst movs :dword) - + (inst cld) DONE ;; Reset the CSP at last moved arg. (inst lea esp-tn (make-ea :dword :base edi :disp n-word-bytes)))) @@ -253,3 +256,54 @@ (:generator 0 (emit-label label) (note-this-location vop :non-local-entry))) + +(define-vop (unwind-to-frame-and-call) + (:args (ofp :scs (descriptor-reg)) + (uwp :scs (descriptor-reg)) + (function :scs (descriptor-reg) :to :load :target saved-function)) + (:arg-types system-area-pointer system-area-pointer t) + (:temporary (:sc sap-reg) temp) + (:temporary (:sc descriptor-reg :offset ebx-offset) saved-function) + (:temporary (:sc unsigned-reg :offset eax-offset) block) + (:generator 22 + ;; Store the function into a non-stack location, since we'll be + ;; unwinding the stack and destroying register contents before we + ;; use it. It turns out that EBX is preserved as part of the + ;; normal multiple-value handling of an unwind, so use that. + (move saved-function function) + + ;; Allocate space for magic UWP block. + (inst sub esp-tn (* unwind-block-size n-word-bytes)) + ;; Set up magic catch / UWP block. + (move block esp-tn) + (loadw temp uwp sap-pointer-slot other-pointer-lowtag) + (storew temp block unwind-block-current-uwp-slot) + (loadw temp ofp sap-pointer-slot other-pointer-lowtag) + (storew temp block unwind-block-current-cont-slot) + + (storew (make-fixup nil :code-object entry-label) + block + catch-block-entry-pc-slot) + + ;; Run any required UWPs. + (inst jmp (make-fixup 'unwind :assembly-routine)) + ENTRY-LABEL + + ;; Move our saved function to where we want it now. + (move block saved-function) + + ;; No parameters + (inst xor ecx-tn ecx-tn) + + ;; Clear the stack + (inst lea esp-tn + (make-ea :dword :base ebp-tn + :disp (* (- sp->fp-offset 3) n-word-bytes))) + + ;; Push the return-pc so it looks like we just called. + (pushw ebp-tn (frame-word-offset return-pc-save-offset)) + + ;; Call it + (inst jmp (make-ea :dword :base block + :disp (- (* closure-fun-slot n-word-bytes) + fun-pointer-lowtag)))))