Author: David Schneider <david.schnei...@picle.org>
Branch: ppc-jit-backend
Changeset: r51457:326dc978de77
Date: 2012-01-18 09:49 -0800
http://bitbucket.org/pypy/pypy/changeset/326dc978de77/
Log: merge heads
diff --git a/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
b/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
--- a/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
+++ b/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
@@ -40,7 +40,7 @@
from pypy.rpython.annlowlevel import llhelper
from pypy.rlib.objectmodel import we_are_translated
from pypy.rpython.lltypesystem.lloperation import llop
-from pypy.jit.backend.ppc.ppcgen.locations import StackLocation
+from pypy.jit.backend.ppc.ppcgen.locations import StackLocation, get_spp_offset
memcpy_fn = rffi.llexternal('memcpy', [llmemory.Address, llmemory.Address,
rffi.SIZE_T], lltype.Void,
@@ -212,7 +212,7 @@
if group == self.FLOAT_TYPE:
assert 0, "not implemented yet"
else:
- start = spp_loc - (stack_location + 1) * WORD
+ start = spp_loc + get_spp_offset(stack_location)
value = rffi.cast(rffi.LONGP, start)[0]
else: # REG_LOC
reg = ord(enc[i])
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
