projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.4.61: stack-alignment on CALL-OUT VOP on x86/Darwin
[sbcl.git]
/
src
/
compiler
/
x86
/
nlx.lisp
diff --git
a/src/compiler/x86/nlx.lisp
b/src/compiler/x86/nlx.lisp
index
4a35f6d
..
35760ab
100644
(file)
--- a/
src/compiler/x86/nlx.lisp
+++ b/
src/compiler/x86/nlx.lisp
@@
-24,7
+24,7
@@
(defun catch-block-ea (tn)
(aver (sc-is tn catch-block))
(make-ea :dword :base ebp-tn
(defun catch-block-ea (tn)
(aver (sc-is tn catch-block))
(make-ea :dword :base ebp-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.
@@
-189,9
+189,9
@@
(inst jmp :le default-lab)
(sc-case tn
((descriptor-reg any-reg)
(inst jmp :le default-lab)
(sc-case tn
((descriptor-reg any-reg)
- (loadw tn start (- (1+ i))))
+ (loadw tn start (frame-word-offset i)))
((control-stack)
((control-stack)
- (loadw move-temp start (- (1+ i)))
+ (loadw move-temp start (frame-word-offset i))
(inst mov tn move-temp)))))
(let ((defaulting-done (gen-label)))
(emit-label defaulting-done)
(inst mov tn move-temp)))))
(let ((defaulting-done (gen-label)))
(emit-label defaulting-done)