(defun catch-block-ea (tn)
(aver (sc-is tn catch-block))
(make-ea :qword :base rbp-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.
(storew rdx-tn rbx-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)
(inst sub rdi n-word-bytes)
(move rcx count) ; fixnum words == bytes
(move num rcx)
- (inst shr rcx word-shift) ; word count for <rep movs>
+ (inst shr rcx n-fixnum-tag-bits) ; word count for <rep movs>
;; If we got zero, we be done.
(inst jrcxz DONE)
;; Copy them down.
(define-vop (unwind-to-frame-and-call)
(:args (ofp :scs (descriptor-reg))
(uwp :scs (descriptor-reg))
- (function :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 rbx-offset) saved-function)
(:temporary (:sc unsigned-reg :offset rax-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.
- (store-tl-symbol-value function
- *unwind-to-frame-function*
- temp)
+ ;; use it. It turns out that RBX 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 rsp-tn (* unwind-block-size n-word-bytes))
(inst jmp temp-reg-tn)
ENTRY-LABEL
- ;; Load function from symbol
- (load-tl-symbol-value block *unwind-to-frame-function*)
+ ;; Move our saved function to where we want it now.
+ (move block saved-function)
;; No parameters
(zeroize rcx-tn)
;; Clear the stack
(inst lea rsp-tn
- (make-ea :qword :base rbp-tn :disp (* -3 n-word-bytes)))
+ (make-ea :qword :base rbp-tn
+ :disp (* (- sp->fp-offset 3) n-word-bytes)))
;; Push the return-pc so it looks like we just called.
(pushw rbp-tn (frame-word-offset return-pc-save-offset))