Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r44787:b9d620503ff5
Date: 2011-06-07 15:22 +0200
http://bitbucket.org/pypy/pypy/changeset/b9d620503ff5/
Log: log also recursion level
diff --git a/pypy/jit/metainterp/logger.py b/pypy/jit/metainterp/logger.py
--- a/pypy/jit/metainterp/logger.py
+++ b/pypy/jit/metainterp/logger.py
@@ -103,7 +103,7 @@
if op.getopnum() == rop.DEBUG_MERGE_POINT:
jd_sd = self.metainterp_sd.jitdrivers_sd[op.getarg(0).getint()]
s = jd_sd.warmstate.get_location_str(op.getarglist()[2:])
- return "debug_merge_point('%s')" % (s,)
+ return "debug_merge_point(%d, '%s')" % (op.getarg(1).getint(), s)
if ops_offset is None:
offset = -1
else:
diff --git a/pypy/jit/metainterp/test/test_logger.py
b/pypy/jit/metainterp/test/test_logger.py
--- a/pypy/jit/metainterp/test/test_logger.py
+++ b/pypy/jit/metainterp/test/test_logger.py
@@ -116,11 +116,11 @@
def test_debug_merge_point(self):
inp = '''
[]
- debug_merge_point(0, "dupa")
+ debug_merge_point(0, 0, "dupa")
'''
_, loop, oloop = self.reparse(inp, check_equal=False)
- assert loop.operations[0].getarg(1)._get_str() == "dupa"
- assert oloop.operations[0].getarg(0)._get_str() == "dupa"
+ assert loop.operations[0].getarg(2)._get_str() == "dupa"
+ assert oloop.operations[0].getarg(1)._get_str() == "dupa"
def test_floats(self):
inp = '''
diff --git a/pypy/jit/tool/oparser.py b/pypy/jit/tool/oparser.py
--- a/pypy/jit/tool/oparser.py
+++ b/pypy/jit/tool/oparser.py
@@ -212,7 +212,7 @@
descr = None
if argspec.strip():
if opname == 'debug_merge_point':
- allargs = argspec.split(',', 1)
+ allargs = argspec.split(',', 2)
else:
allargs = [arg for arg in argspec.split(",")
if arg != '']
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
