[pypy-commit] pypy default: (arigo) also fix for 32bit

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r73863:22a85e994428
Date: 2014-10-09 04:16 -0400
http://bitbucket.org/pypy/pypy/changeset/22a85e994428/

Log:	(arigo) also fix for 32bit

diff --git a/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py b/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
--- a/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
@@ -99,7 +99,7 @@
             i128 = int_mul(i117, i59)
             i129 = int_add(i55, i128)
             f149 = raw_load(i100, i129, descr=<ArrayF 8>)
-            p150 = getfield_gc_pure(p123, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_indices 16>)
+            p150 = getfield_gc_pure(p123, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_indices .+>)
             i151 = int_add(i117, 1)
             setarrayitem_gc(p150, 1, 0, descr=<ArrayS 8>)
             setarrayitem_gc(p150, 0, 0, descr=<ArrayS 8>)
@@ -109,11 +109,11 @@
             guard_false(i155, descr=...)
             p156 = new_with_vtable(...)
             {{{
-            setfield_gc(p156, p49, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_iterator 24>)
-            setfield_gc(p156, i55, descr=<FieldS pypy.module.micronumpy.iterators.IterState.inst_offset 32>)
-            setfield_gc(p156, 0, descr=<FieldS pypy.module.micronumpy.iterators.IterState.inst_index 8>)
-            setfield_gc(p156, p150, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_indices 16>)
-            setfield_gc(p16, p156, descr=<FieldP pypy.module.micronumpy.flatiter.W_FlatIterator.inst_state 56>)
+            setfield_gc(p156, p49, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_iterator .+>)
+            setfield_gc(p156, i55, descr=<FieldS pypy.module.micronumpy.iterators.IterState.inst_offset .+>)
+            setfield_gc(p156, 0, descr=<FieldS pypy.module.micronumpy.iterators.IterState.inst_index .+>)
+            setfield_gc(p156, p150, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_indices .+>)
+            setfield_gc(p16, p156, descr=<FieldP pypy.module.micronumpy.flatiter.W_FlatIterator.inst_state .+>)
             }}}
             jump(p0, p1, p3, p6, p7, p12, p14, p16, i151, f149, p26, i44, i50, i59, i55, i100, p156, p49, descr=...)
         """)
@@ -140,7 +140,7 @@
             i132 = int_add(i53, i131)
             guard_not_invalidated(descr=...)
             raw_store(i103, i132, 42.000000, descr=<ArrayF 8>)
-            p152 = getfield_gc_pure(p126, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_indices 16>)
+            p152 = getfield_gc_pure(p126, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_indices .+>)
             i153 = int_add(i120, 1)
             i154 = getfield_raw(ticker_address, descr=<FieldS pypysig_long_struct.c_value 0>)
             setarrayitem_gc(p152, 1, 0, descr=<ArrayS 8>)
@@ -149,11 +149,11 @@
             guard_false(i157, descr=...)
             p158 = new_with_vtable(...)
             {{{
-            setfield_gc(p158, p47, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_iterator 24>)
-            setfield_gc(p158, i53, descr=<FieldS pypy.module.micronumpy.iterators.IterState.inst_offset 32>)
-            setfield_gc(p158, 0, descr=<FieldS pypy.module.micronumpy.iterators.IterState.inst_index 8>)
-            setfield_gc(p158, p152, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_indices 16>)
-            setfield_gc(p16, p158, descr=<FieldP pypy.module.micronumpy.flatiter.W_FlatIterator.inst_state 56>)
+            setfield_gc(p158, p47, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_iterator .+>)
+            setfield_gc(p158, i53, descr=<FieldS pypy.module.micronumpy.iterators.IterState.inst_offset .+>)
+            setfield_gc(p158, 0, descr=<FieldS pypy.module.micronumpy.iterators.IterState.inst_index .+>)
+            setfield_gc(p158, p152, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_indices .+>)
+            setfield_gc(p16, p158, descr=<FieldP pypy.module.micronumpy.flatiter.W_FlatIterator.inst_state .+>)
             }}}
             jump(p0, p1, p3, p6, p7, p12, p14, p16, i153, i42, i48, i57, i53, p47, i103, p158, descr=...)
         """)