Author: David Schneider <[email protected]>
Branch: remove-globals-in-jit
Changeset: r59683:b11bbf39387b
Date: 2013-01-03 12:46 +0100
http://bitbucket.org/pypy/pypy/changeset/b11bbf39387b/
Log: call grab_frame_values directly when forcing
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
@@ -26,7 +26,7 @@
from pypy.rpython.lltypesystem.lloperation import llop
from pypy.jit.backend.arm.opassembler import ResOpAssembler
from pypy.rlib.debug import (debug_print, debug_start, debug_stop,
- have_debug_prints)
+ have_debug_prints, fatalerror)
from pypy.rlib.jit import AsmInfo
from pypy.rlib.objectmodel import compute_unique_id
@@ -325,7 +325,8 @@
vfp_registers = rffi.cast(rffi.LONGP, stack_pointer)
registers = rffi.ptradd(vfp_registers, 2*len(r.all_vfp_regs))
registers = rffi.cast(rffi.LONGP, registers)
- return self.grab_frame_values(self.cpu, mem_loc, frame_pointer,
+ bytecode = rffi.cast(rffi.UCHARP, mem_loc)
+ return self.grab_frame_values(self.cpu, bytecode, frame_pointer,
registers, vfp_registers)
self.failure_recovery_code = [0, 0, 0, 0]
@@ -335,13 +336,13 @@
llmemory.GCREF))
@staticmethod
- def grab_frame_values(cpu, mem_loc, frame_pointer,
+ #@rgc.no_collect -- XXX still true, but hacked gc_set_extra_threshold
+ def grab_frame_values(cpu, bytecode, frame_pointer,
registers, vfp_registers):
# no malloc allowed here!! xxx apart from one, hacking a lot
force_index = rffi.cast(lltype.Signed, frame_pointer)
num = 0
deadframe = lltype.nullptr(jitframe.DEADFRAME)
- bytecode = rffi.cast(rffi.UCHARP, mem_loc)
# step 1: lots of mess just to count the final value of 'num'
bytecode1 = bytecode
while 1:
@@ -545,7 +546,7 @@
def _build_failure_recovery(self, exc, withfloats=False):
mc = ARMv7Builder()
- decode_registers_addr = llhelper(self._FAILURE_RECOVERY_FUNC,
+ failure_recovery = llhelper(self._FAILURE_RECOVERY_FUNC,
self.failure_recovery_func)
self._insert_checks(mc)
if withfloats:
@@ -570,7 +571,7 @@
# pass the current stack pointer as third param
mc.MOV_rr(r.r2.value, r.sp.value)
self._insert_checks(mc)
- mc.BL(rffi.cast(lltype.Signed, decode_registers_addr))
+ mc.BL(rffi.cast(lltype.Signed, failure_recovery))
if exc:
# save ebx into 'jf_guard_exc'
from pypy.jit.backend.llsupport.descr import unpack_fielddescr
diff --git a/pypy/jit/backend/arm/runner.py b/pypy/jit/backend/arm/runner.py
--- a/pypy/jit/backend/arm/runner.py
+++ b/pypy/jit/backend/arm/runner.py
@@ -111,10 +111,10 @@
assert (rffi.cast(lltype.Signed, bytecode[0]) ==
self.assembler.CODE_FORCED)
bytecode = rffi.ptradd(bytecode, 1)
- deadframe = self.assembler.failure_recovery_func(bytecode,
- addr_of_force_index,
- self.all_null_registers)
-
+ deadframe = self.assembler.grab_frame_values(self,
+ bytecode, addr_of_force_index,
+ self.all_null_registers,
+ self.all_null_registers)
#
assert self.get_latest_descr(deadframe) is faildescr
self.assembler.force_token_to_dead_frame[addr_of_force_index] = (
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
