[pypy-commit] pypy arm-backend-2: merge heads

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: arm-backend-2
Changeset: r56213:dabfd85344e9
Date: 2012-07-17 17:37 +0200
http://bitbucket.org/pypy/pypy/changeset/dabfd85344e9/

Log:	merge heads

diff --git a/pypy/jit/backend/arm/opassembler.py b/pypy/jit/backend/arm/opassembler.py
--- a/pypy/jit/backend/arm/opassembler.py
+++ b/pypy/jit/backend/arm/opassembler.py
@@ -1336,6 +1336,7 @@
     emit_op_convert_longlong_bytes_to_float = gen_emit_unary_float_op('longlong_bytes_to_float', 'VMOV_cc')
 
     def emit_op_read_timestamp(self, op, arglocs, regalloc, fcond):
+	assert 0, 'not supported'
         tmp = arglocs[0]
         res = arglocs[1]
         self.mc.MRC(15, 0, tmp.value, 15, 12, 1)
diff --git a/pypy/jit/backend/x86/test/test_basic.py b/pypy/jit/backend/arm/test/test_basic.py
copy from pypy/jit/backend/x86/test/test_basic.py
copy to pypy/jit/backend/arm/test/test_basic.py
--- a/pypy/jit/backend/x86/test/test_basic.py
+++ b/pypy/jit/backend/arm/test/test_basic.py
@@ -1,20 +1,11 @@
 import py
-from pypy.jit.backend.detect_cpu import getcpuclass
-from pypy.jit.metainterp.warmspot import ll_meta_interp
-from pypy.jit.metainterp.test import support, test_ajit
-from pypy.jit.codewriter.policy import StopAtXPolicy
+from pypy.jit.metainterp.test import test_ajit
 from pypy.rlib.jit import JitDriver
+from pypy.jit.backend.arm.test.support import JitARMMixin
 
-class Jit386Mixin(support.LLJitMixin):
-    type_system = 'lltype'
-    CPUClass = getcpuclass()
-
-    def check_jumps(self, maxcount):
-        pass
-
-class TestBasic(Jit386Mixin, test_ajit.BaseLLtypeTests):
+class TestBasic(JitARMMixin, test_ajit.BaseLLtypeTests):
     # for the individual tests see
-    # ====> ../../../metainterp/test/test_basic.py
+    # ====> ../../../metainterp/test/test_ajit.py
     def test_bug(self):
         jitdriver = JitDriver(greens = [], reds = ['n'])
         class X(object):
@@ -39,3 +30,6 @@
 
     def test_free_object(self):
         py.test.skip("issue of freeing, probably with ll2ctypes")
+
+    def test_read_timestamp(self):
+        py.test.skip("The JIT on ARM does not support read_timestamp")