Author: Maciej Fijalkowski <fij...@gmail.com> Branch: Changeset: r44989:4d20ea094195 Date: 2011-06-17 17:08 +0200 http://bitbucket.org/pypy/pypy/changeset/4d20ea094195/
Log: oops, fix the last checkin, a bit too much work-in-progress checked in 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 @@ -47,10 +47,11 @@ return (bytecode.co_flags & CO_GENERATOR) != 0 -def wrap_oplist(space, logger, operations): +def wrap_oplist(space, logops, operations): list_w = [] for op in operations: - xxx + list_w.append(space.wrap(logops.repr_of_resop(op))) + return list_w class PyPyJitDriver(JitDriver): reds = ['frame', 'ec'] @@ -67,7 +68,7 @@ return if space.is_true(cache.w_compile_hook): logops = logger._make_log_operations() - list_w = wrap_oplist(space, logger, operations) + list_w = wrap_oplist(space, logops, operations) pycode = cast_base_ptr_to_instance(PyCode, ll_pycode) cache.in_recursion = True try: @@ -89,7 +90,7 @@ return if space.is_true(cache.w_compile_hook): logops = logger._make_log_operations() - list_w = wrap_oplist(space, logger, operations) + list_w = wrap_oplist(space, logops, operations) cache.in_recursion = True try: space.call_function(cache.w_compile_hook, diff --git a/pypy/module/pypyjit/test/test_jit_hook.py b/pypy/module/pypyjit/test/test_jit_hook.py --- a/pypy/module/pypyjit/test/test_jit_hook.py +++ b/pypy/module/pypyjit/test/test_jit_hook.py @@ -33,7 +33,6 @@ oplist = parse(""" [i1, i2] i3 = int_add(i1, i2) - debug_merge_point(0, 0, 0, 0, ConstPtr(ptr0)) guard_true(i3) [] """, namespace={'ptr0': 3}).operations _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit