[pypy-commit] pypy default: fix test_compile_asmlen on armv7

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r62889:91509100b64e
Date: 2013-03-30 13:15 +0100
http://bitbucket.org/pypy/pypy/changeset/91509100b64e/

Log:	fix test_compile_asmlen on armv7

diff --git a/rpython/jit/backend/arm/codebuilder.py b/rpython/jit/backend/arm/codebuilder.py
--- a/rpython/jit/backend/arm/codebuilder.py
+++ b/rpython/jit/backend/arm/codebuilder.py
@@ -250,7 +250,7 @@
     def currpos(self):
         raise NotImplementedError
 
-    max_size_of_gen_load_int = 2 * WORD
+    max_size_of_gen_load_int = 2
     def gen_load_int(self, r, value, cond=cond.AL):
         """r is the register number, value is the value to be loaded to the
         register"""
@@ -275,7 +275,7 @@
           self.MOV_rr(reg.pc.value, reg.pc.value)
           self.write32(value)
 
-    max_size_of_gen_load_int = 4 * WORD
+    max_size_of_gen_load_int = 4
     ofs_shift = zip(range(8, 25, 8), range(12, 0, -4))
     def _load_by_shifting(self, r, value, c=cond.AL):
         # to be sure it is only called for the correct cases
diff --git a/rpython/jit/backend/tool/viewcode.py b/rpython/jit/backend/tool/viewcode.py
--- a/rpython/jit/backend/tool/viewcode.py
+++ b/rpython/jit/backend/tool/viewcode.py
@@ -53,8 +53,8 @@
         'x86_32': 'i386',
         'x86_64': 'x86-64',
         'i386': 'i386',
-        'arm': 'arm',
-        'arm_32': 'arm',
+        'armv6_32': 'arm',
+        'armv7_32': 'arm',
     }
     cmd = find_objdump()
     objdump = ('%(command)s -M %(backend)s -b binary -m %(machine)s '