[pypy-commit] pypy ppc-jit-backend: adjust emit_guard_call_assembler and prepare_guard_call_assembler

hager noreply at buildbot.pypy.org
Tue Jan 10 16:14:29 CET 2012


Author: hager <sven.hager at uni-duesseldorf.de>
Branch: ppc-jit-backend
Changeset: r51206:a51d6a2b3e1d
Date: 2012-01-10 16:14 +0100
http://bitbucket.org/pypy/pypy/changeset/a51d6a2b3e1d/

Log:	adjust emit_guard_call_assembler and prepare_guard_call_assembler

diff --git a/pypy/jit/backend/ppc/ppcgen/opassembler.py b/pypy/jit/backend/ppc/ppcgen/opassembler.py
--- a/pypy/jit/backend/ppc/ppcgen/opassembler.py
+++ b/pypy/jit/backend/ppc/ppcgen/opassembler.py
@@ -932,11 +932,11 @@
         self._write_fail_index(fail_index)
 
         descr = op.getdescr()
-        assert isinstance(descr, LoopToken)
+        assert isinstance(descr, JitCellToken)
         # XXX check this
-        assert op.numargs() == len(descr._ppc_arglocs[0])
+        #assert op.numargs() == len(descr._ppc_arglocs[0])
         resbox = TempInt()
-        self._emit_call(fail_index, descr._ppc_direct_bootstrap_code, op.getarglist(),
+        self._emit_call(fail_index, descr._ppc_func_addr, op.getarglist(),
                                 regalloc, result=resbox)
         if op.result is None:
             value = self.cpu.done_with_this_frame_void_v
diff --git a/pypy/jit/backend/ppc/ppcgen/regalloc.py b/pypy/jit/backend/ppc/ppcgen/regalloc.py
--- a/pypy/jit/backend/ppc/ppcgen/regalloc.py
+++ b/pypy/jit/backend/ppc/ppcgen/regalloc.py
@@ -877,10 +877,11 @@
 
     def prepare_guard_call_assembler(self, op, guard_op):
         descr = op.getdescr()
-        assert isinstance(descr, LoopToken)
+        assert isinstance(descr, JitCellToken)
         jd = descr.outermost_jitdriver_sd
         assert jd is not None
-        size = jd.portal_calldescr.get_result_size(self.cpu.translate_support_code)
+        #size = jd.portal_calldescr.get_result_size(self.cpu.translate_support_code)
+        size = jd.portal_calldescr.get_result_size()
         vable_index = jd.index_of_virtualizable
         if vable_index >= 0:
             self._sync_var(op.getarg(vable_index))


More information about the pypy-commit mailing list