Author: Hakan Ardo <ha...@debian.org>
Branch: jit-targets
Changeset: r48783:05b67bb3c2ac
Date: 2011-11-05 15:02 +0100
http://bitbucket.org/pypy/pypy/changeset/05b67bb3c2ac/
Log: first simple loop now passed along all the way in the new format
using labels
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
@@ -134,7 +134,7 @@
return None
loop.operations = loop.operations[:-1] + part.operations
-
+
for box in loop.inputargs:
assert isinstance(box, Box)
@@ -142,7 +142,7 @@
send_loop_to_backend(greenkey, jitdriver_sd, metainterp_sd, loop, "loop")
record_loop_or_bridge(metainterp_sd, loop)
- return loop.token
+ return procedure_token
if False: # FIXME: full_preamble_needed??
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
@@ -2034,7 +2034,7 @@
live_arg_boxes[num_green_args:],
start_resumedescr)
if procedure_token is not None: # raise if it *worked* correctly
- self.jitdriver_sd.attach_procedure_to_interp(greenkey,
procedure_token)
+ self.jitdriver_sd.warmstate.attach_procedure_to_interp(greenkey,
procedure_token)
self.history.inputargs = None
self.history.operations = None
raise GenerateMergePoint(live_arg_boxes, procedure_token)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
