Author: David Schneider <[email protected]>
Branch: arm-backend-2
Changeset: r47340:8b92c8397ad4
Date: 2011-09-14 14:56 +0200
http://bitbucket.org/pypy/pypy/changeset/8b92c8397ad4/
Log: (arigo, bivab) update backend to acknowledge the change in the
interface of rewrite_assembler
diff --git a/pypy/jit/backend/arm/assembler.py
b/pypy/jit/backend/arm/assembler.py
--- a/pypy/jit/backend/arm/assembler.py
+++ b/pypy/jit/backend/arm/assembler.py
@@ -81,7 +81,7 @@
def setup(self, looptoken, operations):
self.current_clt = looptoken.compiled_loop_token
- self.cpu.gc_ll_descr.rewrite_assembler(self.cpu,
+ operations = self.cpu.gc_ll_descr.rewrite_assembler(self.cpu,
operations, self.current_clt.allgcrefs)
assert self.memcpy_addr != 0, 'setup_once() not called?'
self.mc = ARMv7Builder()
@@ -90,6 +90,7 @@
allblocks = self.get_asmmemmgr_blocks(looptoken)
self.datablockwrapper = MachineDataBlockWrapper(self.cpu.asmmemmgr,
allblocks)
+ return operations
def teardown(self):
self.current_clt = None
@@ -582,7 +583,7 @@
clt.allgcrefs = []
looptoken.compiled_loop_token = clt
- self.setup(looptoken, operations)
+ operations = self.setup(looptoken, operations)
self._dump(operations)
longevity = compute_vars_longevity(inputargs, operations)
regalloc = Regalloc(longevity, assembler=self,
frame_manager=ARMFrameManager())
@@ -622,7 +623,7 @@
def assemble_bridge(self, faildescr, inputargs, operations,
original_loop_token, log):
- self.setup(original_loop_token, operations)
+ operations = self.setup(original_loop_token, operations)
self._dump(operations, 'bridge')
assert isinstance(faildescr, AbstractFailDescr)
code = faildescr._failure_recovery_code
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
