Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r44790:040a63663644 Date: 2011-06-07 15:42 +0200 http://bitbucket.org/pypy/pypy/changeset/040a63663644/
Log: merge heads 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/metainterp/test/test_warmspot.py b/pypy/jit/metainterp/test/test_warmspot.py --- a/pypy/jit/metainterp/test/test_warmspot.py +++ b/pypy/jit/metainterp/test/test_warmspot.py @@ -80,7 +80,7 @@ self.meta_interp(f, [123, 10]) assert len(get_stats().locations) >= 4 for loc in get_stats().locations: - assert loc == (123,) + assert loc == (0, 123) def test_set_param_enable_opts(self): from pypy.rpython.annlowlevel import llstr, hlstr 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