Author: Richard Plangger <[email protected]>
Branch: s390x-backend
Changeset: r81873:45cca792fa2e
Date: 2016-01-20 10:06 +0100
http://bitbucket.org/pypy/pypy/changeset/45cca792fa2e/
Log: fixed tests that fail after applying the scale in gc_load_indexed_r
(llsupport/gc.py)
diff --git a/rpython/jit/backend/llsupport/test/test_pinned_object_rewrite.py
b/rpython/jit/backend/llsupport/test/test_pinned_object_rewrite.py
--- a/rpython/jit/backend/llsupport/test/test_pinned_object_rewrite.py
+++ b/rpython/jit/backend/llsupport/test/test_pinned_object_rewrite.py
@@ -127,7 +127,7 @@
i0 = getfield_gc_i(ConstPtr(pinned_obj_gcref),
descr=pinned_obj_my_int_descr)
""", """
[]
- p1 = gc_load_indexed_r(ConstPtr(ptr_array_gcref), 0,
%(ptr_array_descr.itemsize)s, 1, %(ptr_array_descr.itemsize)s)
+ p1 = gc_load_indexed_r(ConstPtr(ptr_array_gcref), %(0 *
ptr_array_descr.itemsize + 1)s, 1, 0, %(ptr_array_descr.itemsize)s)
i0 = gc_load_i(p1, 0, -%(pinned_obj_my_int_descr.field_size)s)
""")
assert len(self.gc_ll_descr.last_moving_obj_tracker._indexes) == 1
@@ -140,10 +140,10 @@
i2 = getfield_gc_i(ConstPtr(pinned_obj_gcref),
descr=pinned_obj_my_int_descr)
""", """
[]
- p1 = gc_load_indexed_r(ConstPtr(ptr_array_gcref), 0,
%(ptr_array_descr.itemsize)s, 1, %(ptr_array_descr.itemsize)s)
+ p1 = gc_load_indexed_r(ConstPtr(ptr_array_gcref), %(0 *
ptr_array_descr.itemsize + 1)s, 1, 0, %(ptr_array_descr.itemsize)s)
i0 = gc_load_i(p1, 0, -%(pinned_obj_my_int_descr.field_size)s)
i1 = gc_load_i(ConstPtr(notpinned_obj_gcref), 0,
-%(notpinned_obj_my_int_descr.field_size)s)
- p2 = gc_load_indexed_r(ConstPtr(ptr_array_gcref), 1,
%(ptr_array_descr.itemsize)s, 1, %(ptr_array_descr.itemsize)s)
+ p2 = gc_load_indexed_r(ConstPtr(ptr_array_gcref), %(1 *
ptr_array_descr.itemsize + 1)s, 1, 0, %(ptr_array_descr.itemsize)s)
i2 = gc_load_i(p2, 0, -%(pinned_obj_my_int_descr.field_size)s)
""")
assert len(self.gc_ll_descr.last_moving_obj_tracker._indexes) == 2
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
