Commits

Sven Hager committed a51d6a2

adjust emit_guard_call_assembler and prepare_guard_call_assembler

Comments (0)

Files changed (2)

pypy/jit/backend/ppc/ppcgen/opassembler.py

         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

pypy/jit/backend/ppc/ppcgen/regalloc.py

 
     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))