Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r70799:2dee4269a986
Date: 2014-04-20 11:09 +0200
http://bitbucket.org/pypy/pypy/changeset/2dee4269a986/
Log: Revert these changes, probably not necessary
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -46,15 +46,9 @@
# ____________________________________________________________
-class PyPyJitDriver(jit.JitDriver):
- reds = ['frame', 'ec']
- greens = ['next_instr', 'is_being_profiled', 'pycode']
- virtualizables = ['frame']
- stm_do_transaction_breaks = True
- is_main_for_pypy = True # XXX temporary: turning 'greens' into a string
- # is hard-coded in C code. Don't change 'greens'
-
-stmonly_jitdriver = PyPyJitDriver()
+stmonly_jitdriver = jit.JitDriver(greens=[], reds=['next_instr', 'ec',
+ 'self', 'co_code'],
+ stm_do_transaction_breaks=True)
# ____________________________________________________________
@@ -77,9 +71,8 @@
# only used for no-jit. The jit-jitdriver is
# in interp_jit.py
stmonly_jitdriver.jit_merge_point(
- frame=self, pycode=co_code,
- next_instr=next_instr, ec=ec,
- is_being_profiled=self.is_being_profiled)
+ self=self, co_code=co_code,
+ next_instr=next_instr, ec=ec)
next_instr = self.handle_bytecode(co_code, next_instr, ec)
rstm.update_marker_num(intmask(next_instr) * 2 + 1)
except ExitFrame:
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
@@ -12,7 +12,6 @@
from pypy.interpreter.pycode import CO_GENERATOR
from pypy.interpreter.pyframe import PyFrame
from pypy.interpreter.pyopcode import ExitFrame, Yield
-from pypy.interpreter.pyopcode import PyPyJitDriver
from opcode import opmap
@@ -37,10 +36,16 @@
def should_unroll_one_iteration(next_instr, is_being_profiled, bytecode):
return (bytecode.co_flags & CO_GENERATOR) != 0
+class PyPyJitDriver(JitDriver):
+ reds = ['frame', 'ec']
+ greens = ['next_instr', 'is_being_profiled', 'pycode']
+ virtualizables = ['frame']
+
pypyjitdriver = PyPyJitDriver(get_printable_location = get_printable_location,
should_unroll_one_iteration =
should_unroll_one_iteration,
- name='pypyjit')
+ name='pypyjit',
+ stm_do_transaction_breaks=True)
class __extend__(PyFrame):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
