[pypy-commit] pypy jit-tracehook: fix for new greenkeys

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: jit-tracehook
Changeset: r53085:a174f7421083
Date: 2012-03-01 17:15 -0500
http://bitbucket.org/pypy/pypy/changeset/a174f7421083/

Log:	fix for new greenkeys

diff --git a/pypy/module/pypyjit/interp_jit.py b/pypy/module/pypyjit/interp_jit.py
--- a/pypy/module/pypyjit/interp_jit.py
+++ b/pypy/module/pypyjit/interp_jit.py
@@ -26,16 +26,16 @@
 
 JUMP_ABSOLUTE = opmap['JUMP_ABSOLUTE']
 
-def get_printable_location(next_instr, is_being_profiled, bytecode):
+def get_printable_location(next_instr, is_being_profiled, bytecode, w_f_trace, w_tracefunc):
     from pypy.tool.stdlib_opcode import opcode_method_names
     name = opcode_method_names[ord(bytecode.co_code[next_instr])]
     return '%s #%d %s' % (bytecode.get_repr(), next_instr, name)
 
-def get_jitcell_at(next_instr, is_being_profiled, bytecode):
-    return bytecode.jit_cells.get((next_instr, is_being_profiled), None)
+def get_jitcell_at(next_instr, is_being_profiled, bytecode, w_f_trace, w_tracefunc):
+    return bytecode.jit_cells.get((next_instr, is_being_profiled, w_f_trace, w_tracefunc), None)
 
-def set_jitcell_at(newcell, next_instr, is_being_profiled, bytecode):
-    bytecode.jit_cells[next_instr, is_being_profiled] = newcell
+def set_jitcell_at(newcell, next_instr, is_being_profiled, bytecode, w_f_trace, w_tracefunc):
+    bytecode.jit_cells[next_instr, is_being_profiled, w_f_trace, w_tracefunc] = newcell
 
 def should_unroll_one_iteration(next_instr, is_being_profiled, bytecode):
     return (bytecode.co_flags & CO_GENERATOR) != 0