Author: Hakan Ardo <ha...@debian.org>
Branch: jit-targets
Changeset: r48861:963c63e3066e
Date: 2011-11-07 11:27 +0100
http://bitbucket.org/pypy/pypy/changeset/963c63e3066e/
Log: rename TargetToken.cell_token into
TargetToke.targeting_jitcell_token
diff --git a/pypy/jit/metainterp/history.py b/pypy/jit/metainterp/history.py
--- a/pypy/jit/metainterp/history.py
+++ b/pypy/jit/metainterp/history.py
@@ -766,11 +766,15 @@
self.compiled_loop_token.cpu.dump_loop_token(self)
class TargetToken(AbstractDescr):
- def __init__(self, cell_token):
- self.cell_token = cell_token
+ def __init__(self, targeting_jitcell_token):
+ # The jitcell to which jumps might result in a jump to this label
+ self.targeting_jitcell_token = targeting_jitcell_token
+
+ # The jitcell where the trace containing the label with this
TargetToken begins
+ self.original_jitcell_token = None
+
self.virtual_state = None
self.exported_state = None
- self.original_jitcell_token = None
class TreeLoop(object):
inputargs = None
diff --git a/pypy/jit/metainterp/optimizeopt/unroll.py
b/pypy/jit/metainterp/optimizeopt/unroll.py
--- a/pypy/jit/metainterp/optimizeopt/unroll.py
+++ b/pypy/jit/metainterp/optimizeopt/unroll.py
@@ -104,7 +104,7 @@
self.export_state(stop_label)
loop.operations.append(stop_label)
else:
- assert stop_label.getdescr().cell_token is
start_label.getdescr().cell_token
+ assert stop_label.getdescr().targeting_jitcell_token is
start_label.getdescr().targeting_jitcell_token
jumpop = ResOperation(rop.JUMP, stop_label.getarglist(), None,
descr=start_label.getdescr())
self.close_loop(jumpop)
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
@@ -2037,10 +2037,10 @@
live_arg_boxes[num_green_args:],
start_resumedescr)
if target_token is not None: # raise if it *worked* correctly
- self.jitdriver_sd.warmstate.attach_procedure_to_interp(greenkey,
target_token.cell_token)
+ self.jitdriver_sd.warmstate.attach_procedure_to_interp(greenkey,
target_token.targeting_jitcell_token)
self.history.inputargs = None
self.history.operations = None
- raise GenerateMergePoint(live_arg_boxes, target_token.cell_token)
+ raise GenerateMergePoint(live_arg_boxes,
target_token.targeting_jitcell_token)
def compile_trace(self, live_arg_boxes, start_resumedescr):
num_green_args = self.jitdriver_sd.num_green_args
@@ -2058,7 +2058,7 @@
if target_token is not None: # raise if it *worked* correctly
self.history.inputargs = None
self.history.operations = None
- raise GenerateMergePoint(live_arg_boxes, target_token.cell_token)
+ raise GenerateMergePoint(live_arg_boxes,
target_token.targeting_jitcell_token)
def compile_bridge_and_loop(self, original_boxes, live_arg_boxes, start,
bridge_arg_boxes, start_resumedescr):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
