Author: Hakan Ardo <[email protected]>
Branch: jit-multilabel
Changeset: r50608:de71b40cee0f
Date: 2011-12-17 13:12 +0100
http://bitbucket.org/pypy/pypy/changeset/de71b40cee0f/
Log: kill ExportedState.jump_args
diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -212,13 +212,12 @@
try:
optimize_trace(metainterp_sd, part, jitdriver_sd.warmstate.enable_opts)
except InvalidLoop:
- #return None # XXX: Dissable for now
# Fall back on jumping to preamble
target_token = label.getdescr()
assert isinstance(target_token, TargetToken)
assert target_token.exported_state
part.operations = [orignial_label] + \
- [ResOperation(rop.JUMP,
target_token.exported_state.jump_args,
+ [ResOperation(rop.JUMP, inputargs[:],
None, descr=loop_jitcell_token)]
try:
optimize_trace(metainterp_sd, part,
jitdriver_sd.warmstate.enable_opts,
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
@@ -158,9 +158,7 @@
target_token.virtual_state = virtual_state
target_token.short_preamble = [ResOperation(rop.LABEL,
short_inputargs, None)]
target_token.start_resumedescr = start_resumedescr
- target_token.exported_state = ExportedState(short_boxes,
- inputarg_setup_ops,
self.optimizer,
- jump_args)
+ target_token.exported_state = ExportedState(short_boxes,
inputarg_setup_ops, self.optimizer)
def import_state(self, targetop):
self.did_import = False
@@ -539,9 +537,7 @@
self.unroll.add_op_to_short(self.op, False, True)
class ExportedState(object):
- def __init__(self, short_boxes, inputarg_setup_ops, optimizer,
- jump_args):
+ def __init__(self, short_boxes, inputarg_setup_ops, optimizer):
self.short_boxes = short_boxes
self.inputarg_setup_ops = inputarg_setup_ops
self.optimizer = optimizer
- self.jump_args = jump_args
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
