Author: Maciej Fijalkowski <[email protected]>
Branch: resume-refactor
Changeset: r68639:86df5551ea2e
Date: 2014-01-12 17:42 +0100
http://bitbucket.org/pypy/pypy/changeset/86df5551ea2e/
Log: hack some more
diff --git a/rpython/jit/backend/llgraph/runner.py
b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -789,8 +789,11 @@
values = []
for i in range(len(self.current_op.failargs)):
arg = self.current_op.failargs[i]
- value = self.env[arg]
- values.append(value)
+ if arg is None:
+ values.append(None)
+ else:
+ value = self.env[arg]
+ values.append(value)
if hasattr(descr, '_llgraph_bridge'):
target = (descr._llgraph_bridge, -1)
raise Jump(target, values)
diff --git a/rpython/jit/metainterp/resume2.py
b/rpython/jit/metainterp/resume2.py
--- a/rpython/jit/metainterp/resume2.py
+++ b/rpython/jit/metainterp/resume2.py
@@ -91,6 +91,10 @@
val = self.cpu.get_int_value(self.deadframe, jitframe_pos)
self.bhinterp_stack[frame_no].registers_i[frontend_position] = val
+ def put_box_ref(self, frame_no, frontend_position, jitframe_pos):
+ val = self.cpu.get_ref_value(self.deadframe, jitframe_pos)
+ self.bhinterp_stack[frame_no].registers_r[frontend_position] = val
+
def resume_set_pc(self, pc):
self.bhinterp_stack[-1].position = pc
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
