Author: fijal
Branch: jit-leaner-frontend
Changeset: r82877:0be62192045f
Date: 2016-03-08 12:31 +0200
http://bitbucket.org/pypy/pypy/changeset/0be62192045f/
Log: progress
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
@@ -1007,7 +1007,7 @@
metainterp_sd.stats.add_jitcell_token(jitcell_token)
-def compile_trace(metainterp, resumekey):
+def compile_trace(metainterp, resumekey, runtime_boxes):
"""Try to compile a new bridge leading from the beginning of the history
to some existing place.
"""
@@ -1034,7 +1034,7 @@
call_pure_results = metainterp.call_pure_results
if metainterp.history.ends_with_jump:
- data = BridgeCompileData(trace, inputargs,
+ data = BridgeCompileData(trace, runtime_boxes,
call_pure_results=call_pure_results,
enable_opts=enable_opts,
inline_short_preamble=inline_short_preamble)
diff --git a/rpython/jit/metainterp/pyjitpl.py
b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -2611,7 +2611,8 @@
descr=target_jitcell_token)
self.history.ends_with_jump = True
try:
- target_token = compile.compile_trace(self, self.resumekey)
+ target_token = compile.compile_trace(self, self.resumekey,
+ live_arg_boxes[num_green_args:])
finally:
self.history.cut(cut_at) # pop the jump
if target_token is not None: # raise if it *worked* correctly
@@ -2643,7 +2644,7 @@
# FIXME: can we call compile_trace?
token = loop_tokens[0].finishdescr
self.history.record(rop.FINISH, exits, None, descr=token)
- target_token = compile.compile_trace(self, self.resumekey)
+ target_token = compile.compile_trace(self, self.resumekey, exits)
if target_token is not token:
compile.giveup()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
