Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r52024:f054c58ba588
Date: 2012-02-01 11:20 -0500
http://bitbucket.org/pypy/pypy/changeset/f054c58ba588/
Log: Rename in_recursion to portal_call_depth in the metainterp, which
makes much more sense.
diff --git a/pypy/jit/metainterp/pyjitpl.py b/pypy/jit/metainterp/pyjitpl.py
--- a/pypy/jit/metainterp/pyjitpl.py
+++ b/pypy/jit/metainterp/pyjitpl.py
@@ -974,13 +974,13 @@
any_operation = len(self.metainterp.history.operations) > 0
jitdriver_sd = self.metainterp.staticdata.jitdrivers_sd[jdindex]
self.verify_green_args(jitdriver_sd, greenboxes)
- self.debug_merge_point(jitdriver_sd, jdindex,
self.metainterp.in_recursion,
+ self.debug_merge_point(jitdriver_sd, jdindex,
self.metainterp.portal_call_depth,
greenboxes)
if self.metainterp.seen_loop_header_for_jdindex < 0:
if not any_operation:
return
- if self.metainterp.in_recursion or not
self.metainterp.get_procedure_token(greenboxes, True):
+ if self.metainterp.portal_call_depth or not
self.metainterp.get_procedure_token(greenboxes, True):
if not jitdriver_sd.no_loop_header:
return
# automatically add a loop_header if there is none
@@ -992,7 +992,7 @@
self.metainterp.seen_loop_header_for_jdindex = -1
#
- if not self.metainterp.in_recursion:
+ if not self.metainterp.portal_call_depth:
assert jitdriver_sd is self.metainterp.jitdriver_sd
# Set self.pc to point to jit_merge_point instead of just after:
# if reached_loop_header() raises SwitchToBlackhole, then the
@@ -1028,11 +1028,11 @@
assembler_call=True)
raise ChangeFrame
- def debug_merge_point(self, jitdriver_sd, jd_index, in_recursion,
greenkey):
+ def debug_merge_point(self, jitdriver_sd, jd_index, portal_call_depth,
greenkey):
# debugging: produce a DEBUG_MERGE_POINT operation
loc = jitdriver_sd.warmstate.get_location_str(greenkey)
debug_print(loc)
- args = [ConstInt(jd_index), ConstInt(in_recursion)] + greenkey
+ args = [ConstInt(jd_index), ConstInt(portal_call_depth)] + greenkey
self.metainterp.history.record(rop.DEBUG_MERGE_POINT, args, None)
@arguments("box", "label")
@@ -1552,7 +1552,7 @@
# ____________________________________________________________
class MetaInterp(object):
- in_recursion = 0
+ portal_call_depth = 0
cancel_count = 0
def __init__(self, staticdata, jitdriver_sd):
@@ -1587,7 +1587,7 @@
def newframe(self, jitcode, greenkey=None):
if jitcode.is_portal:
- self.in_recursion += 1
+ self.portal_call_depth += 1
if greenkey is not None and self.is_main_jitcode(jitcode):
self.portal_trace_positions.append(
(greenkey, len(self.history.operations)))
@@ -1603,7 +1603,7 @@
frame = self.framestack.pop()
jitcode = frame.jitcode
if jitcode.is_portal:
- self.in_recursion -= 1
+ self.portal_call_depth -= 1
if frame.greenkey is not None and self.is_main_jitcode(jitcode):
self.portal_trace_positions.append(
(None, len(self.history.operations)))
@@ -1662,17 +1662,17 @@
raise self.staticdata.ExitFrameWithExceptionRef(self.cpu,
excvaluebox.getref_base())
def check_recursion_invariant(self):
- in_recursion = -1
+ portal_call_depth = -1
for frame in self.framestack:
jitcode = frame.jitcode
assert jitcode.is_portal == len([
jd for jd in self.staticdata.jitdrivers_sd
if jd.mainjitcode is jitcode])
if jitcode.is_portal:
- in_recursion += 1
- if in_recursion != self.in_recursion:
- print "in_recursion problem!!!"
- print in_recursion, self.in_recursion
+ portal_call_depth += 1
+ if portal_call_depth != self.portal_call_depth:
+ print "portal_call_depth problem!!!"
+ print portal_call_depth, self.portal_call_depth
for frame in self.framestack:
jitcode = frame.jitcode
if jitcode.is_portal:
@@ -2183,11 +2183,11 @@
def initialize_state_from_start(self, original_boxes):
# ----- make a new frame -----
- self.in_recursion = -1 # always one portal around
+ self.portal_call_depth = -1 # always one portal around
self.framestack = []
f = self.newframe(self.jitdriver_sd.mainjitcode)
f.setup_call(original_boxes)
- assert self.in_recursion == 0
+ assert self.portal_call_depth == 0
self.virtualref_boxes = []
self.initialize_withgreenfields(original_boxes)
self.initialize_virtualizable(original_boxes)
@@ -2198,7 +2198,7 @@
# otherwise the jit_virtual_refs are left in a dangling state.
rstack._stack_criticalcode_start()
try:
- self.in_recursion = -1 # always one portal around
+ self.portal_call_depth = -1 # always one portal around
self.history = history.History()
inputargs_and_holes = self.rebuild_state_after_failure(resumedescr)
self.history.inputargs = [box for box in inputargs_and_holes if
box]
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
