#+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 rax-offset)
- (:temp ebx unsigned-reg rbx-offset)
+ (;; These are really arguments.
(:temp ecx unsigned-reg rcx-offset)
(:temp esi unsigned-reg rsi-offset)
;; These we need as temporaries.
+ (:temp eax unsigned-reg rax-offset)
+ (:temp ebx unsigned-reg rbx-offset)
(:temp edx unsigned-reg rdx-offset)
(:temp edi unsigned-reg rdi-offset))
(inst cmp ecx (fixnumize 3))
(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 :qword :base rbp-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 :qword :base rbp-tn
+ :disp (frame-byte-offset return-pc-save-offset)))
+ (inst mov rbp-tn (make-ea :qword :base rbp-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 3) ; fixnum to raw word count
+ (inst shr ecx (1- n-lowtag-bits))
(inst std) ; count down
- (inst sub esi 8) ; ?
+ (inst sub esi n-word-bytes)
(inst lea edi (make-ea :qword :base ebx :disp (- n-word-bytes)))
(inst rep)
(inst movs :qword)
;; And back we go.
(inst stc)
- (inst jmp eax)
+ (inst push eax)
+ (inst ret)
;; Handle the register arg cases.
ZERO-VALUES
- (move rsp-tn ebx)
+ (inst lea ebx (make-ea :qword :base rbp-tn
+ :disp (* sp->fp-offset n-word-bytes)))
(inst mov edx nil-value)
(inst mov edi edx)
(inst mov esi edx)
+ (inst mov rsp-tn rbp-tn)
(inst stc)
- (inst jmp eax)
+ (inst pop rbp-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 rsp-tn ebx)
+ (inst mov rsp-tn rbp-tn)
(inst clc)
- (inst jmp eax)
+ (inst pop rbp-tn)
+ (inst ret)
TWO-VALUES
+ (inst lea ebx (make-ea :qword :base rbp-tn
+ :disp (* sp->fp-offset n-word-bytes)))
(loadw edx esi -1)
(loadw edi esi -2)
(inst mov esi nil-value)
- (inst lea rsp-tn (make-ea :qword :base ebx :disp (* -2 n-word-bytes)))
+ (inst mov rsp-tn rbp-tn)
(inst stc)
- (inst jmp eax)
+ (inst pop rbp-tn)
+ (inst ret)
THREE-VALUES
+ (inst lea ebx (make-ea :qword :base rbp-tn
+ :disp (* sp->fp-offset n-word-bytes)))
(loadw edx esi -1)
(loadw edi esi -2)
(loadw esi esi -3)
- (inst lea rsp-tn (make-ea :qword :base ebx :disp (* -3 n-word-bytes)))
+ (inst mov rsp-tn rbp-tn)
(inst stc)
- (inst jmp eax))
+ (inst pop rbp-tn)
+ (inst ret))
\f
;;;; TAIL-CALL-VARIABLE
;; 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 3) ; fixnum to raw words
+ (inst shr ecx (1- n-lowtag-bits))
(inst std) ; count down
(inst lea edi (make-ea :qword :base rbp-tn :disp (frame-byte-offset 0)))
(inst sub esi (fixnumize 1))
;; Clear most of 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))
fun-pointer-lowtag))))
\f
(define-assembly-routine (throw
- (:return-style :none))
+ (:return-style :raw))
((:arg target (descriptor-reg any-reg) rdx-offset)
(:arg start any-reg rbx-offset)
(:arg count any-reg rcx-offset)
LOOP
- (let ((error (generate-error-code nil 'unseen-throw-tag-error target)))
+ (let ((error (gen-label)))
+ (assemble (*elsewhere*)
+ (emit-label error)
+
+ ;; Fake up a stack frame so that backtraces come out right.
+ (inst push rbp-tn)
+ (inst mov rbp-tn rsp-tn)
+
+ (emit-error-break nil error-trap
+ (error-number-or-lose 'unseen-throw-tag-error)
+ (list target)))
(inst or catch catch) ; check for NULL pointer
(inst jmp :z error))
projects / sbcl.git / blobdiff