Author: Alex Gaynor <[email protected]>
Branch: on-abort-resops
Changeset: r64400:9073505f32a7
Date: 2013-05-21 13:05 -0700
http://bitbucket.org/pypy/pypy/changeset/9073505f32a7/
Log: A branch in which to make the on_abort jit hook include the resops
so far.
diff --git a/pypy/module/pypyjit/policy.py b/pypy/module/pypyjit/policy.py
--- a/pypy/module/pypyjit/policy.py
+++ b/pypy/module/pypyjit/policy.py
@@ -1,9 +1,11 @@
from rpython.jit.codewriter.policy import JitPolicy
+from rpython.rlib import jit_hooks
from rpython.rlib.jit import JitHookInterface, Counters
-from rpython.rlib import jit_hooks
+
from pypy.interpreter.error import OperationError
-from pypy.module.pypyjit.interp_resop import Cache, wrap_greenkey,\
- WrappedOp, W_JitLoopInfo
+from pypy.module.pypyjit.interp_resop import (Cache, wrap_greenkey,
+ WrappedOp, W_JitLoopInfo)
+
class PyPyJitIface(JitHookInterface):
def on_abort(self, reason, jitdriver, greenkey, greenkey_repr):
diff --git a/rpython/rlib/jit_hooks.py b/rpython/rlib/jit_hooks.py
--- a/rpython/rlib/jit_hooks.py
+++ b/rpython/rlib/jit_hooks.py
@@ -1,11 +1,10 @@
+from rpython.annotator import model as annmodel
+from rpython.rlib.objectmodel import specialize
+from rpython.rtyper.annlowlevel import (cast_instance_to_base_ptr,
+ cast_base_ptr_to_instance, llstr)
+from rpython.rtyper.extregistry import ExtRegistryEntry
+from rpython.rtyper.lltypesystem import llmemory, lltype, rclass
-from rpython.rtyper.extregistry import ExtRegistryEntry
-from rpython.annotator import model as annmodel
-from rpython.rtyper.lltypesystem import llmemory, lltype
-from rpython.rtyper.lltypesystem import rclass
-from rpython.rtyper.annlowlevel import cast_instance_to_base_ptr,\
- cast_base_ptr_to_instance, llstr
-from rpython.rlib.objectmodel import specialize
def register_helper(s_result):
def wrapper(helper):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
