[pypy-commit] pypy jit-targets: cleaner to use jump_args

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-targets
Changeset: r50355:3c35f57a7f67
Date: 2011-12-10 16:56 +0100
http://bitbucket.org/pypy/pypy/changeset/3c35f57a7f67/

Log:	cleaner to use 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
@@ -214,7 +214,7 @@
         assert isinstance(target_token, TargetToken)
         assert target_token.exported_state
         part.operations = [label] + \
-                          [ResOperation(rop.JUMP, target_token.exported_state.original_jump_args,
+                          [ResOperation(rop.JUMP, target_token.exported_state.jump_args,
                                         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
@@ -171,7 +171,7 @@
         target_token.start_resumedescr = start_resumedescr
         target_token.exported_state = ExportedState(constant_inputargs, short_boxes,
                                                     inputarg_setup_ops, self.optimizer,
-                                                    aliased_vrituals, original_jump_args)
+                                                    aliased_vrituals, jump_args)
 
     def import_state(self, targetop):
         self.did_import = False
@@ -593,10 +593,10 @@
 class ExportedState(object):
     def __init__(self, constant_inputargs,
                  short_boxes, inputarg_setup_ops, optimizer, aliased_vrituals,
-                 original_jump_args):
+                 jump_args):
         self.constant_inputargs = constant_inputargs
         self.short_boxes = short_boxes
         self.inputarg_setup_ops = inputarg_setup_ops
         self.optimizer = optimizer
         self.aliased_vrituals = aliased_vrituals
-        self.original_jump_args = original_jump_args
+        self.jump_args = jump_args