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
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*)
(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)
#!+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)))
\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 (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)))
(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)
temp)
;; Allocate space for magic UWP block.
- (inst sub esp-tn unwind-block-size)
+ (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)
;; Clear the stack
(inst lea esp-tn
- (make-ea :dword :base ebp-tn :disp (* -3 n-word-bytes)))
+ (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 -2)
+ (pushw ebp-tn (frame-word-offset return-pc-save-offset))
;; Call it
(inst jmp (make-ea :dword :base block