Author: Armin Rigo <ar...@tunes.org>
Branch: jitframe-on-heap
Changeset: r62335:d55895010d2f
Date: 2013-03-14 02:13 +0100
http://bitbucket.org/pypy/pypy/changeset/d55895010d2f/
Log: merge heads
diff --git a/rpython/jit/backend/x86/arch.py b/rpython/jit/backend/x86/arch.py
--- a/rpython/jit/backend/x86/arch.py
+++ b/rpython/jit/backend/x86/arch.py
@@ -30,9 +30,9 @@
# start of every frame: the saved value of some registers
if WORD == 4:
- # ebp + ebx + esi + edi + 12 extra words + return address = 17 words
- FRAME_FIXED_SIZE = 17
- PASS_ON_MY_FRAME = 12
+ # ebp + ebx + esi + edi + 14 extra words + return address = 19 words
+ FRAME_FIXED_SIZE = 19
+ PASS_ON_MY_FRAME = 14
JITFRAME_FIXED_SIZE = 6 + 8 * 2 # 6 GPR + 8 XMM * 2 WORDS/float
else:
# rbp + rbx + r12 + r13 + r14 + r15 + 12 extra words + return address = 19
diff --git a/rpython/jit/backend/x86/assembler.py
b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -1118,11 +1118,6 @@
n = len(arglocs)
for i in range(start, n):
loc = arglocs[i]
- if isinstance(loc, RegLoc):
- if loc.is_xmm:
- stack_depth += 2
- else:
- stack_depth += 1
stack_depth += loc.get_width() // WORD
if stack_depth > stack_max:
align = align_stack_words(stack_depth - stack_max)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
