[pypy-commit] pypy gc_no_cleanup_nursery: Simplify the entry condition a little bit

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: gc_no_cleanup_nursery
Changeset: r73680:a738fd00ee83
Date: 2014-09-24 18:29 +0200
http://bitbucket.org/pypy/pypy/changeset/a738fd00ee83/

Log:	Simplify the entry condition a little bit

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -2376,7 +2376,8 @@
             scale = get_scale(itemsize_loc.value)
         else:
             assert isinstance(startindex_loc, ImmedLoc)
-            assert startindex_loc.value == 0
+            baseofs += startindex_loc.value * itemsize_loc.value
+            startindex_loc = imm0
             scale = 0
         null_reg_cleared = False
         i = 0
diff --git a/rpython/jit/backend/x86/regalloc.py b/rpython/jit/backend/x86/regalloc.py
--- a/rpython/jit/backend/x86/regalloc.py
+++ b/rpython/jit/backend/x86/regalloc.py
@@ -1397,8 +1397,7 @@
             constbytes = -1
         if 0 <= constbytes <= 16 * 8 and (
                 valid_addressing_size(itemsize) or
-                (isinstance(startindex_loc, ImmedLoc) and
-                  startindex_loc.value == 0)):
+-               isinstance(startindex_loc, ImmedLoc)):
             if IS_X86_64:
                 null_loc = X86_64_XMM_SCRATCH_REG
             else: