[pypy-commit] pypy jit-leaner-frontend: reenable jit hooks

[fijal]

Author: fijal
Branch: jit-leaner-frontend
Changeset: r83362:2e8ef5f3792a
Date: 2016-03-25 16:21 +0200
http://bitbucket.org/pypy/pypy/changeset/2e8ef5f3792a/

Log:    reenable jit hooks

diff --git a/pypy/goal/targetpypystandalone.py 
b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -336,7 +336,7 @@
     def jitpolicy(self, driver):
         from pypy.module.pypyjit.policy import PyPyJitPolicy
         from pypy.module.pypyjit.hooks import pypy_hooks
-        return PyPyJitPolicy() #pypy_hooks)
+        return PyPyJitPolicy(pypy_hooks)
 
     def get_entry_point(self, config):
         from pypy.tool.lib_pypy import import_from_lib_pypy
diff --git a/pypy/module/pypyjit/__init__.py b/pypy/module/pypyjit/__init__.py
--- a/pypy/module/pypyjit/__init__.py
+++ b/pypy/module/pypyjit/__init__.py
@@ -12,9 +12,9 @@
         'dont_trace_here': 'interp_jit.dont_trace_here',
         'trace_next_iteration': 'interp_jit.trace_next_iteration',
         'trace_next_iteration_hash': 'interp_jit.trace_next_iteration_hash',
-        #'set_compile_hook': 'interp_resop.set_compile_hook',
-        #'set_abort_hook': 'interp_resop.set_abort_hook',
-        #'set_trace_too_long_hook': 'interp_resop.set_trace_too_long_hook',
+        'set_compile_hook': 'interp_resop.set_compile_hook',
+        'set_abort_hook': 'interp_resop.set_abort_hook',
+        'set_trace_too_long_hook': 'interp_resop.set_trace_too_long_hook',
         'get_stats_snapshot': 'interp_resop.get_stats_snapshot',
         'get_stats_asmmemmgr': 'interp_resop.get_stats_asmmemmgr',
         # those things are disabled because they have bugs, but if
@@ -23,10 +23,10 @@
         # correct loop_runs if PYPYLOG is correct
         #'enable_debug': 'interp_resop.enable_debug',
         #'disable_debug': 'interp_resop.disable_debug',
-        #'ResOperation': 'interp_resop.WrappedOp',
-        #'GuardOp': 'interp_resop.GuardOp',
-        #'DebugMergePoint': 'interp_resop.DebugMergePoint',
-        #'JitLoopInfo': 'interp_resop.W_JitLoopInfo',
+        'ResOperation': 'interp_resop.WrappedOp',
+        'GuardOp': 'interp_resop.GuardOp',
+        'DebugMergePoint': 'interp_resop.DebugMergePoint',
+        'JitLoopInfo': 'interp_resop.W_JitLoopInfo',
         'PARAMETER_DOCS': 'space.wrap(rpython.rlib.jit.PARAMETER_DOCS)',
     }
 
diff --git a/pypy/module/pypyjit/interp_resop.py 
b/pypy/module/pypyjit/interp_resop.py
--- a/pypy/module/pypyjit/interp_resop.py
+++ b/pypy/module/pypyjit/interp_resop.py
@@ -249,7 +249,7 @@
                 ofs = debug_info.asminfo.ops_offset
             else:
                 ofs = {}
-            _, ops = debug_info.trace.unpack()
+            ops = debug_info.operations
             self.w_ops = space.newlist(wrap_oplist(space, logops, ops, ofs))
         else:
             self.w_ops = space.w_None
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit