#+sb-assembling ;; We don't want a vop for this one.
(define-assembly-routine
(return-multiple (:return-style :none))
- (;; These four are really arguments.
- (:temp eax unsigned-reg eax-offset)
- (:temp ebx unsigned-reg ebx-offset)
+ (;; These are really arguments.
(:temp ecx unsigned-reg ecx-offset)
(:temp esi unsigned-reg esi-offset)
;; These we need as temporaries.
+ (:temp eax unsigned-reg eax-offset)
+ (:temp ebx unsigned-reg ebx-offset)
(:temp edx unsigned-reg edx-offset)
(:temp edi unsigned-reg edi-offset))
;; Pick off the cases where everything fits in register args.
- (inst jecxz zero-values)
+ (inst jecxz ZERO-VALUES)
(inst cmp ecx (fixnumize 1))
- (inst jmp :e one-value)
+ (inst jmp :e ONE-VALUE)
(inst cmp ecx (fixnumize 2))
- (inst jmp :e two-values)
+ (inst jmp :e TWO-VALUES)
(inst cmp ecx (fixnumize 3))
- (inst jmp :e three-values)
+ (inst jmp :e THREE-VALUES)
- ;; Save the count, because the loop is going to destroy it.
- (inst mov edx ecx)
+ ;; As per the calling convention EBX is expected to point at the SP
+ ;; before the stack frame.
+ (inst lea ebx (make-ea :dword :base ebp-tn
+ :disp (* sp->fp-offset n-word-bytes)))
+ ;; Save the count, the return address and restore the frame pointer,
+ ;; because the loop is going to destroy them.
+ (inst mov edx ecx)
+ (inst mov eax (make-ea :dword :base ebp-tn
+ :disp (frame-byte-offset return-pc-save-offset)))
+ (inst mov ebp-tn (make-ea :dword :base ebp-tn
+ :disp (frame-byte-offset ocfp-save-offset)))
;; Blit the values down the stack. Note: there might be overlap, so
;; we have to be careful not to clobber values before we've read
- ;; them. Because the stack builds down, we are coping to a larger
+ ;; them. Because the stack builds down, we are copying to a larger
;; address. Therefore, we need to iterate from larger addresses to
;; smaller addresses. pfw-this says copy ecx words from esi to edi
;; counting down.
- (inst shr ecx 2) ; fixnum to raw word count
+ (inst shr ecx (1- n-lowtag-bits))
(inst std) ; count down
- (inst sub esi 4) ; ?
+ (inst sub esi n-word-bytes)
(inst lea edi (make-ea :dword :base ebx :disp (- n-word-bytes)))
(inst rep)
(inst movs :dword)
-
- ;; solaris requires DF being zero.
- #!+sunos (inst cld)
+ (inst cld)
;; Restore the count.
(inst mov ecx edx)
;; And back we go.
(inst stc)
- (inst jmp eax)
+ (inst push eax)
+ (inst ret)
;; Handle the register arg cases.
ZERO-VALUES
- (move esp-tn ebx)
+ (inst lea ebx (make-ea :dword :base ebp-tn
+ :disp (* sp->fp-offset n-word-bytes)))
(inst mov edx nil-value)
(inst mov edi edx)
(inst mov esi edx)
+ (inst mov esp-tn ebp-tn)
(inst stc)
- (inst jmp eax)
+ (inst pop ebp-tn)
+ (inst ret)
- ONE-VALUE ; Note: we can get this, because the return-multiple vop
- ; doesn't check for this case when size > speed.
+ ;; Note: we can get this, because the return-multiple vop doesn't
+ ;; check for this case when size > speed.
+ ONE-VALUE
(loadw edx esi -1)
- (inst mov esp-tn ebx)
+ (inst mov esp-tn ebp-tn)
(inst clc)
- (inst jmp eax)
+ (inst pop ebp-tn)
+ (inst ret)
TWO-VALUES
+ (inst lea ebx (make-ea :dword :base ebp-tn
+ :disp (* sp->fp-offset n-word-bytes)))
(loadw edx esi -1)
(loadw edi esi -2)
(inst mov esi nil-value)
- (inst lea esp-tn (make-ea :dword :base ebx :disp (* -2 n-word-bytes)))
+ (inst mov esp-tn ebp-tn)
(inst stc)
- (inst jmp eax)
+ (inst pop ebp-tn)
+ (inst ret)
THREE-VALUES
+ (inst lea ebx (make-ea :dword :base ebp-tn
+ :disp (* sp->fp-offset n-word-bytes)))
(loadw edx esi -1)
(loadw edi esi -2)
(loadw esi esi -3)
- (inst lea esp-tn (make-ea :dword :base ebx :disp (* -3 n-word-bytes)))
+ (inst mov esp-tn ebp-tn)
(inst stc)
- (inst jmp eax))
+ (inst pop ebp-tn)
+ (inst ret))
\f
;;;; TAIL-CALL-VARIABLE
(inst cmp ecx (fixnumize 3))
(inst jmp :le REGISTER-ARGS)
- ;; Save the OLD-FP and RETURN-PC because the blit it going to trash
- ;; those stack locations. Save the ECX, because the loop is going
- ;; to trash it.
- (pushw ebp-tn -1)
- (loadw ebx ebp-tn -2)
+ ;; Save the OLD-FP and RETURN-PC because the blit is going to trash
+ ;; those stack locations. Save the ECX, because the loop is going to
+ ;; trash it.
+ (pushw ebp-tn (frame-word-offset ocfp-save-offset))
+ (loadw ebx ebp-tn (frame-word-offset return-pc-save-offset))
(inst push ecx)
;; Do the blit. Because we are coping from smaller addresses to
;; larger addresses, we have to start at the largest pair and work
;; our way down.
- (inst shr ecx 2) ; fixnum to raw words
+ (inst shr ecx (1- n-lowtag-bits))
(inst std) ; count down
- (inst lea edi (make-ea :dword :base ebp-tn :disp (- n-word-bytes)))
+ (inst lea edi (make-ea :dword :base ebp-tn :disp (frame-byte-offset 0)))
(inst sub esi (fixnumize 1))
(inst rep)
(inst movs :dword)
-
- ;; solaris requires DF being zero.
- #!+sunos (inst cld)
+ (inst cld)
;; Load the register arguments carefully.
- (loadw edx ebp-tn -1)
+ (loadw edx ebp-tn (frame-word-offset ocfp-save-offset))
;; Restore OLD-FP and ECX.
(inst pop ecx)
- (popw ebp-tn -1) ; overwrites a0
+ ;; Overwrites a1
+ (popw ebp-tn (frame-word-offset ocfp-save-offset))
;; Blow off the stack above the arguments.
(inst lea esp-tn (make-ea :dword :base edi :disp n-word-bytes))
;; remaining register args
- (loadw edi ebp-tn -2)
- (loadw esi ebp-tn -3)
+ (inst mov edi edx)
+ (loadw edx ebp-tn (frame-word-offset 0))
+ (loadw esi ebp-tn (frame-word-offset 2))
;; Push the (saved) return-pc so it looks like we just called.
(inst push ebx)
;; And jump into the function.
- (inst jmp
- (make-ea :byte :base eax
- :disp (- (* closure-fun-slot n-word-bytes)
- fun-pointer-lowtag)))
+ (inst jmp (make-ea-for-object-slot eax closure-fun-slot fun-pointer-lowtag))
;; All the arguments fit in registers, so load them.
REGISTER-ARGS
;; Clear most of 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))
;; And away we go.
- (inst jmp (make-ea :byte :base eax
- :disp (- (* closure-fun-slot n-word-bytes)
- fun-pointer-lowtag))))
+ (inst jmp (make-ea-for-object-slot eax closure-fun-slot fun-pointer-lowtag)))
\f
(define-assembly-routine (throw
- (:return-style :none))
+ (:return-style :raw))
((:arg target (descriptor-reg any-reg) edx-offset)
(:arg start any-reg ebx-offset)
(:arg count any-reg ecx-offset)
LOOP
- (let ((error (generate-error-code nil unseen-throw-tag-error target)))
- (inst or catch catch) ; check for NULL pointer
+ (let ((error (gen-label)))
+ (assemble (*elsewhere*)
+ (emit-label error)
+
+ ;; Fake up a stack frame so that backtraces come out right.
+ (inst push ebp-tn)
+ (inst mov ebp-tn esp-tn)
+
+ (emit-error-break nil error-trap
+ (error-number-or-lose 'unseen-throw-tag-error)
+ (list target)))
+ (inst test catch catch) ; check for NULL pointer
(inst jmp :z error))
(inst cmp target (make-ea-for-object-slot catch catch-block-tag-slot 0))
- (inst jmp :e exit)
+ (inst jmp :e EXIT)
(loadw catch catch catch-block-previous-catch-slot)
- (inst jmp loop)
+ (inst jmp LOOP)
EXIT
(:temp uwp unsigned-reg esi-offset))
(declare (ignore start count))
- (let ((error (generate-error-code nil invalid-unwind-error)))
- (inst or block block) ; check for NULL pointer
+ (let ((error (generate-error-code nil 'invalid-unwind-error)))
+ (inst test block block) ; check for NULL pointer
(inst jmp :z error))
(load-tl-symbol-value uwp *current-unwind-protect-block*)
(inst cmp uwp
(make-ea-for-object-slot block unwind-block-current-uwp-slot 0))
;; If a match, return to context in arg block.
- (inst jmp :e do-exit)
+ (inst jmp :e DO-EXIT)
;; Not a match - return to *CURRENT-UNWIND-PROTECT-BLOCK* context.
;; Important! Must save (and return) the arg 'block' for later use!!
;; be saved on the stack: the block in edx-tn, start in ebx-tn, and
;; count in ecx-tn.
- (inst jmp (make-ea :byte :base block
- :disp (* unwind-block-entry-pc-slot n-word-bytes))))
+ (inst jmp (make-ea-for-object-slot block unwind-block-entry-pc-slot 0)))
;;;; Win32 non-local exit noise
(:arg count (any-reg descriptor-reg) ecx-offset))
(declare (ignore start count))
- (let ((error (generate-error-code nil invalid-unwind-error)))
- (inst or block block) ; check for NULL pointer
+ (let ((error (generate-error-code nil 'invalid-unwind-error)))
+ (inst test block block) ; check for NULL pointer
(inst jmp :z error))
;; Save all our registers, as we're about to clobber them.
(inst push 0)
(inst push 0)
(inst push ecx-tn)
- (inst call (make-fixup "RtlUnwind@16" :foreign)))
+ (inst call (make-fixup "RtlUnwind" :foreign)))
;; We want no VOP for this one and for it to only happen on Win32
;; targets. Hence the following disaster.
;; Nlx-entry expects the arg start in ebx-tn and the arg count
;; in ecx-tn. Fortunately, that's where they are already.
- (inst jmp (make-ea :byte :base block
- :disp (* unwind-block-entry-pc-slot n-word-bytes))))
+ (inst jmp (make-ea-for-object-slot block unwind-block-entry-pc-slot 0)))
;;;; Win32 UWP block SEH interface.
(inst xor ecx-tn ecx-tn)
(inst mov ebx-tn ebp-tn)
(loadw ebp-tn block unwind-block-current-cont-slot)
- (inst jmp (make-ea :byte :base block
- :disp (* unwind-block-entry-pc-slot n-word-bytes))))
+ (inst jmp (make-ea-for-object-slot block unwind-block-entry-pc-slot 0)))
#!+win32
(define-assembly-routine (continue-unwind
projects / sbcl.git / blobdiff