(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)
(aver (sc-is tn catch-block))
(make-ea :dword :base ebp-tn
- :disp (- (* (+ (tn-offset tn) catch-block-size) n-word-bytes))))
+ :disp (frame-byte-offset (+ -1 (tn-offset tn) catch-block-size))))
\f
;;;; Save and restore dynamic environment.
(define-vop (current-binding-pointer)
(:results (res :scs (any-reg descriptor-reg)))
(:generator 1
- (load-tl-symbol-value res *binding-stack-pointer*)))
+ (load-binding-stack-pointer res)))
\f
;;;; unwind block hackery
(storew temp block unwind-block-current-uwp-slot)
(storew ebp-tn block unwind-block-current-cont-slot)
(storew (make-fixup nil :code-object entry-label)
- block catch-block-entry-pc-slot)))
+ block catch-block-entry-pc-slot)
+ #!+win32
+ (progn
+ (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
;;; tag, and link the block into the CURRENT-CATCH list
(storew ebp-tn block unwind-block-current-cont-slot)
(storew (make-fixup nil :code-object entry-label)
block catch-block-entry-pc-slot)
+ #!+win32
+ (progn
+ (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*)
(storew temp block catch-block-previous-catch-slot)
;;; unwind block as an unwind-protect.
(define-vop (set-unwind-protect)
(:args (tn))
- (:temporary (:sc unsigned-reg) new-uwp #!+sb-thread tls)
+ (:temporary (:sc unsigned-reg) new-uwp #!+sb-thread tls #!+win32 seh-frame)
(:generator 7
(inst lea new-uwp (catch-block-ea tn))
+ #!+win32
+ (progn
+ (storew (make-fixup 'uwp-seh-handler :assembly-routine)
+ new-uwp unwind-block-seh-frame-handler-slot)
+ (inst lea seh-frame
+ (make-ea-for-object-slot new-uwp
+ unwind-block-next-seh-frame-slot 0))
+ (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)
(store-tl-symbol-value block *current-catch-block* tls)))
(define-vop (unlink-unwind-protect)
- (:temporary (:sc unsigned-reg) block #!+sb-thread tls)
+ ;; NOTE: When we have both #!+sb-thread and #!+win32, we only need one temp
+ (:temporary (:sc unsigned-reg) block #!+sb-thread tls #!+win32 seh-frame)
(:policy :fast-safe)
(:translate %unwind-protect-breakup)
(:generator 17
(load-tl-symbol-value block *current-unwind-protect-block*)
+ #!+win32
+ (progn
+ (loadw seh-frame block unwind-block-next-seh-frame-slot)
+ (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)))
\f
(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 (- (1+ i))))
+ (loadw tn start (frame-word-offset (+ sp->fp-offset i))))
((control-stack)
- (loadw move-temp start (- (1+ 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)))
(move num ecx)
(inst shr ecx word-shift) ; word count for <rep movs>
;; 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
- ;; solaris requires DF being zero.
- #!+sunos (inst cld)
;; Reset the CSP at last moved arg.
(inst lea esp-tn (make-ea :dword :base edi :disp n-word-bytes))))
(: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)))))
projects / sbcl.git / blobdiff