[pypy-commit] pypy s390x-backend: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: s390x-backend
Changeset: r82817:a554729812fd
Date: 2016-03-06 18:17 +0100
http://bitbucket.org/pypy/pypy/changeset/a554729812fd/

Log:	merge heads

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
@@ -540,8 +540,9 @@
             scale, offset, v_length_scaled = \
                     self._emit_mul_if_factor_offset_not_supported(v_length, scale, 0)
         v_scale = ConstInt(scale)
-        # there is probably no point in doing _emit_mul_if.. for
-        # c_zero!
+        # there is probably no point in doing _emit_mul_if.. for c_zero!
+        # NOTE that the scale might be != 1 for e.g. v_length_scaled if it is a constant
+        # it is later applied in emit_pending_zeros
         args = [v_arr, self.c_zero, v_length_scaled, ConstInt(scale), v_scale]
         o = ResOperation(rop.ZERO_ARRAY, args, descr=arraydescr)
         self.emit_op(o)
diff --git a/rpython/jit/metainterp/resoperation.py b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -1224,8 +1224,9 @@
     'SETINTERIORFIELD_GC/3d/n',
     'SETINTERIORFIELD_RAW/3d/n',    # right now, only used by tests
     'SETFIELD_GC/2d/n',
-    'ZERO_ARRAY/4d/n',  # only emitted by the rewrite, clears (part of) an array
-                        # [arraygcptr, firstindex, length], descr=ArrayDescr
+    'ZERO_ARRAY/5d/n',  # only emitted by the rewrite, clears (part of) an array
+                        # [arraygcptr, firstindex, length, scale_firstindex,
+                        #  scale_length], descr=ArrayDescr
     'SETFIELD_RAW/2d/n',
     'STRSETITEM/3/n',
     'UNICODESETITEM/3/n',