Author: David Schneider <[email protected]>
Branch: jitframe-on-heap
Changeset: r62308:69ca2c717461
Date: 2013-03-12 10:14 +0100
http://bitbucket.org/pypy/pypy/changeset/69ca2c717461/
Log: update details in test_gc_integration for ARM
diff --git a/rpython/jit/backend/arm/runner.py
b/rpython/jit/backend/arm/runner.py
--- a/rpython/jit/backend/arm/runner.py
+++ b/rpython/jit/backend/arm/runner.py
@@ -113,4 +113,5 @@
class CPU_ARMHF(AbstractARMCPU):
"""ARM v7 uses hardfp ABI, requires vfp"""
use_hf_abi = True
+ backend_name = "armhf"
supports_floats = False
diff --git a/rpython/jit/backend/llsupport/test/test_gc_integration.py
b/rpython/jit/backend/llsupport/test/test_gc_integration.py
--- a/rpython/jit/backend/llsupport/test/test_gc_integration.py
+++ b/rpython/jit/backend/llsupport/test/test_gc_integration.py
@@ -241,16 +241,22 @@
gc_ll_descr.check_nothing_in_nursery()
assert gc_ll_descr.addrs[0] == nurs_adr + 64
# slowpath never called
- assert gc_ll_descr.calls == []
+ assert gc_ll_descr.calls == []
def test_malloc_slowpath(self):
def check(frame):
- assert len(frame.jf_gcmap) == 1
+ expected_size = 1
+ idx = 0
+ if self.cpu.backend_name.startswith('arm'):
+ # jitframe fixed part is larger here
+ expected_size = 2
+ idx = 1
+ assert len(frame.jf_gcmap) == expected_size
if self.cpu.IS_64_BIT:
- assert frame.jf_gcmap[0] == (1<<29) | (1 << 30)
+ assert frame.jf_gcmap[idx] == (1<<29) | (1 << 30)
else:
- assert frame.jf_gcmap[0] == (1<<24) | (1 << 23)
-
+ assert frame.jf_gcmap[idx] == (1<<24) | (1 << 23)
+
self.cpu = self.getcpu(check)
ops = '''
[i0]
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
