Author: Richard Plangger <[email protected]>
Branch: s390x-backend
Changeset: r81739:9eb93197f4a6
Date: 2016-01-13 13:13 +0100
http://bitbucket.org/pypy/pypy/changeset/9eb93197f4a6/
Log: renamed method on literal pool object, changed call sites to use the
right function name
diff --git a/rpython/jit/backend/zarch/assembler.py
b/rpython/jit/backend/zarch/assembler.py
--- a/rpython/jit/backend/zarch/assembler.py
+++ b/rpython/jit/backend/zarch/assembler.py
@@ -1179,7 +1179,7 @@
self.mc.b_offset(descr._ll_loop_code + self.mc.LARL_byte_count)
else:
# restore the pool address
- offset = self.pool.get_descr_offset(descr) + \
+ offset = self.pool.get_offset(descr) + \
JUMPABS_TARGET_ADDR__POOL_OFFSET
offset_pool = offset + JUMPABS_POOL_ADDR_POOL_OFFSET
self.mc.LG(r.SCRATCH, l.pool(offset))
diff --git a/rpython/jit/backend/zarch/regalloc.py
b/rpython/jit/backend/zarch/regalloc.py
--- a/rpython/jit/backend/zarch/regalloc.py
+++ b/rpython/jit/backend/zarch/regalloc.py
@@ -134,7 +134,7 @@
def ensure_reg(self, box, force_in_reg, selected_reg=None):
if isinstance(box, Const):
- offset = self.assembler.pool.get_descr_offset(box)
+ offset = self.assembler.pool.get_offset(box)
poolloc = l.pool(offset)
if force_in_reg:
if selected_reg is None:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
