projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.44.2: don't add pointless TYPEP T constraints
[sbcl.git]
/
src
/
compiler
/
x86-64
/
nlx.lisp
diff --git
a/src/compiler/x86-64/nlx.lisp
b/src/compiler/x86-64/nlx.lisp
index
96cf3f8
..
4cc02fd
100644
(file)
--- a/
src/compiler/x86-64/nlx.lisp
+++ b/
src/compiler/x86-64/nlx.lisp
@@
-24,7
+24,7
@@
(defun catch-block-ea (tn)
(aver (sc-is tn catch-block))
(make-ea :qword :base rbp-tn
(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.
\f
;;;; Save and restore dynamic environment.
@@
-152,28
+152,35
@@
(loadw (tn-ref-tn values) start -1)
(emit-label no-values)))
(t
(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))
(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)
(inst cmp count (fixnumize i))
(inst jmp :le default-lab)
+ (when first-stack-arg-p
+ (storew rdx-tn rbx-tn -1))
(sc-case tn
((descriptor-reg any-reg)
(sc-case tn
((descriptor-reg any-reg)
- (loadw tn start (- (1+ i))))
+ (loadw tn start (frame-word-offset (+ sp->fp-offset i))))
((control-stack)
((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*)
(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 rdx-tn))
+ (inst mov (second default) nil-value))
(inst jmp defaulting-done))))))
(inst mov rsp-tn sp)))
(inst jmp defaulting-done))))))
(inst mov rsp-tn sp)))
@@
-212,7
+219,7
@@
(inst std)
(inst rep)
(inst movs :qword)
(inst std)
(inst rep)
(inst movs :qword)
-
+ (inst cld)
DONE
;; Reset the CSP at last moved arg.
(inst lea rsp-tn (make-ea :qword :base rdi :disp n-word-bytes))))
DONE
;; Reset the CSP at last moved arg.
(inst lea rsp-tn (make-ea :qword :base rdi :disp n-word-bytes))))
@@
-245,7
+252,7
@@
temp)
;; Allocate space for magic UWP block.
temp)
;; Allocate space for magic UWP block.
- (inst sub rsp-tn unwind-block-size)
+ (inst sub rsp-tn (* unwind-block-size n-word-bytes))
;; Set up magic catch / UWP block.
(move block rsp-tn)
(loadw temp uwp sap-pointer-slot other-pointer-lowtag)
;; Set up magic catch / UWP block.
(move block rsp-tn)
(loadw temp uwp sap-pointer-slot other-pointer-lowtag)
@@
-271,10
+278,11
@@
;; Clear the stack
(inst lea rsp-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.
;; Push the return-pc so it looks like we just called.
- (pushw rbp-tn -2)
+ (pushw rbp-tn (frame-word-offset return-pc-save-offset))
;; Call it
(inst jmp (make-ea :qword :base block
;; Call it
(inst jmp (make-ea :qword :base block