Author: Maciej Fijalkowski <[email protected]>
Branch: jitframe-on-heap
Changeset: r61466:d19b75514eb9
Date: 2013-02-19 21:23 +0200
http://bitbucket.org/pypy/pypy/changeset/d19b75514eb9/
Log: merge
diff --git a/rpython/jit/backend/arm/opassembler.py
b/rpython/jit/backend/arm/opassembler.py
--- a/rpython/jit/backend/arm/opassembler.py
+++ b/rpython/jit/backend/arm/opassembler.py
@@ -1234,7 +1234,7 @@
if gcrootmap:
self.call_reacquire_gil(gcrootmap, resloc, fcond)
- self._emit_guard_may_force(guard_op, arglocs, numargs)
+ self._emit_guard_may_force(guard_op, arglocs[numargs+1:], numargs)
return fcond
def call_release_gil(self, gcrootmap, save_registers, fcond):
diff --git a/rpython/jit/backend/arm/test/test_jump.py
b/rpython/jit/backend/arm/test/test_jump.py
--- a/rpython/jit/backend/arm/test/test_jump.py
+++ b/rpython/jit/backend/arm/test/test_jump.py
@@ -6,7 +6,8 @@
from rpython.jit.backend.arm.jump import remap_frame_layout,
remap_frame_layout_mixed
from rpython.jit.metainterp.history import INT
-frame_pos = ARMFrameManager.frame_pos
+fm = ARMFrameManager(0)
+frame_pos = fm.frame_pos
class MockAssembler:
def __init__(self):
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
@@ -23,8 +23,7 @@
# for the individual tests see
# ====> ../../test/runner_test.py
- add_loop_instructions = ['nop', # this is the same as mov r0, r0
- 'adds', 'cmp', 'beq', 'b']
+ add_loop_instructions = ['ldr', 'mov', 'adds', 'cmp', 'beq', 'b']
bridge_loop_instructions = ['movw', 'movt', 'bx']
def get_cpu(self):
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
@@ -69,7 +69,7 @@
'file': tmpfile,
'origin': originaddr,
'backend': objdump_backend_option[backend_name],
- 'machine': 'i386' if backend_name != 'arm' else 'arm',
+ 'machine': 'i386' if not backend_name.startswith('arm') else 'arm',
}, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = p.communicate()
assert not p.returncode, ('Encountered an error running objdump: %s' %
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
