Author: Maciej Fijalkowski <[email protected]>
Branch: jitframe-on-heap
Changeset: r61344:175ce157b84b
Date: 2013-02-17 14:58 +0200
http://bitbucket.org/pypy/pypy/changeset/175ce157b84b/
Log: maybe it's not such a bad idea to just waste a word and have
simplified logic
diff --git a/rpython/jit/backend/arm/arch.py b/rpython/jit/backend/arm/arch.py
--- a/rpython/jit/backend/arm/arch.py
+++ b/rpython/jit/backend/arm/arch.py
@@ -17,4 +17,5 @@
# A jitframe is a jit.backend.llsupport.llmodel.jitframe.JITFRAME
# Stack frame fixed area
# Currently only the force_index
-JITFRAME_FIXED_SIZE = 12 + 16 * 2 # 11 GPR + one word to keep alignment + 16
VFP Regs (64bit)
+JITFRAME_FIXED_SIZE = 11 + 16 * 2 + 1
+# 11 GPR + 16 VFP Regs (64bit) + 1 word for alignment
diff --git a/rpython/jit/backend/llsupport/rewrite.py
b/rpython/jit/backend/llsupport/rewrite.py
--- a/rpython/jit/backend/llsupport/rewrite.py
+++ b/rpython/jit/backend/llsupport/rewrite.py
@@ -178,10 +178,8 @@
index_list = loop_token.compiled_loop_token._ll_initial_locs
for i, arg in enumerate(arglist):
descr = self.cpu.getarraydescr_for_frame(arg.type)
+ assert self.cpu.JITFRAME_FIXED_SIZE & 1 == 0
_, itemsize, _ = self.cpu.unpack_arraydescr_size(descr)
- # XXX
- # this calculation breaks for floats on 32 bit if
- # base_ofs of JITFRAME + index * 8 is not double-word aligned
index = index_list[i] // itemsize # index is in bytes
self.newops.append(ResOperation(rop.SETARRAYITEM_GC,
[frame, ConstInt(index),
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
@@ -2220,14 +2220,13 @@
# load the return value from the dead frame's value index 0
kind = op.result.type
descr = self.cpu.getarraydescr_for_frame(kind)
+ ofs = self.cpu.unpack_arraydescr(descr)
if kind == FLOAT:
- ofs = self.cpu.unpack_arraydescr(descr)
self.mc.MOVSD_xm(xmm0.value, (eax.value, ofs))
if result_loc is not xmm0:
self.mc.MOVSD(result_loc, xmm0)
else:
assert result_loc is eax
- ofs = self.cpu.unpack_arraydescr(descr)
self.mc.MOV_rm(eax.value, (eax.value, ofs))
def _call_assembler_patch_jmp(self, jmp_location):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
