[pypy-commit] pypy jit-leaner-frontend: whack at compile.py

[fijal]

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82850:4c340087dad9
Date: 2016-03-07 18:08 +0200
http://bitbucket.org/pypy/pypy/changeset/4c340087dad9/

Log:    whack at compile.py

diff --git a/rpython/jit/metainterp/compile.py 
b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -259,14 +259,13 @@
     assert start == 0
     #ops = history.operations[start:]
     if 'unroll' not in enable_opts or not 
metainterp.cpu.supports_guard_gc_type:
+        xxx
         return compile_simple_loop(metainterp, greenkey, start, inputargs, ops,
                                    jumpargs, enable_opts)
     jitcell_token = make_jitcell_token(jitdriver_sd)
-    label = ResOperation(rop.LABEL, inputargs,
-                         descr=TargetToken(jitcell_token))
     end_label = ResOperation(rop.LABEL, jumpargs, descr=jitcell_token)
     call_pure_results = metainterp.call_pure_results
-    preamble_data = LoopCompileData(label, end_label, history.trace,
+    preamble_data = LoopCompileData(history.trace, inputargs,
                                     call_pure_results=call_pure_results,
                                     enable_opts=enable_opts)
     try:
@@ -1031,19 +1030,19 @@
         inline_short_preamble = True
     inputargs = metainterp.history.inputargs[:]
     trace = metainterp.history.trace
-    label = ResOperation(rop.LABEL, inputargs)
     jitdriver_sd = metainterp.jitdriver_sd
     enable_opts = jitdriver_sd.warmstate.enable_opts
 
     call_pure_results = metainterp.call_pure_results
 
     if metainterp.history.ends_with_jump:
+        xxx
         data = BridgeCompileData(label, operations[:],
                                  call_pure_results=call_pure_results,
                                  enable_opts=enable_opts,
                                  inline_short_preamble=inline_short_preamble)
     else:
-        data = SimpleCompileData(label, trace,
+        data = SimpleCompileData(trace,
                                  call_pure_results=call_pure_results,
                                  enable_opts=enable_opts)
     try:
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebridge.py 
b/rpython/jit/metainterp/optimizeopt/test/test_optimizebridge.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebridge.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebridge.py
@@ -11,7 +11,7 @@
     def optimize(self, ops, bridge_ops, expected, expected_loop=None,
                  inline_short_preamble=True, jump_values=None,
                  bridge_values=None):
-        loop = self.parse(ops, postprocess=self.postprocess)
+        loop = self.parse(ops)
         self.set_values(loop.operations, jump_values)
         if expected_loop is not None:
             xxx
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit