Author: David Schneider <[email protected]>
Branch:
Changeset: r63102:c6892e8a418f
Date: 2013-04-06 13:30 +0200
http://bitbucket.org/pypy/pypy/changeset/c6892e8a418f/
Log: fix test_compile_asmlen on ARMv6 by introducing a * marker in
checkops to skip checking instructions (for inline constants)
diff --git a/rpython/jit/backend/arm/test/test_runner.py
b/rpython/jit/backend/arm/test/test_runner.py
--- a/rpython/jit/backend/arm/test/test_runner.py
+++ b/rpython/jit/backend/arm/test/test_runner.py
@@ -34,11 +34,11 @@
else:
bridge_loop_instructions = ['ldr', 'mov', 'nop', 'nop', 'nop', 'cmp',
'bge',
'push', 'ldr', 'mov',
- '', # inline constant
+ '*', # inline constant
'push', 'ldr', 'mov',
- 'ldrsblt', #inline constant (decodes as
instruction)
+ '*', # inline constant
'blx', 'ldr', 'mov',
- '', # inline constant
+ '*', # inline constant
'bx']
def get_cpu(self):
diff --git a/rpython/jit/backend/test/runner_test.py
b/rpython/jit/backend/test/runner_test.py
--- a/rpython/jit/backend/test/runner_test.py
+++ b/rpython/jit/backend/test/runner_test.py
@@ -3475,6 +3475,8 @@
def checkops(mc, ops):
assert len(mc) == len(ops)
for i in range(len(mc)):
+ if ops[i] == '*':
+ continue # ingore ops marked as '*', i.e. inline constants
assert mc[i].split("\t")[2].startswith(ops[i])
data = ctypes.string_at(info.asmaddr, info.asmlen)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
