Author: Armin Rigo <[email protected]>
Branch: jit-leaner-frontend
Changeset: r82945:6ab28e9da460
Date: 2016-03-10 16:03 +0100
http://bitbucket.org/pypy/pypy/changeset/6ab28e9da460/
Log: merge heads
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.operations
+ _, ops = debug_info.trace.unpack()
self.w_ops = space.newlist(wrap_oplist(space, logops, ops, ofs))
else:
self.w_ops = space.w_None
diff --git a/rpython/jit/metainterp/compile.py
b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -287,6 +287,7 @@
return None
if ((warmstate.vec and jitdriver_sd.vec) or warmstate.vec_all):
+ assert False, "vectorization disabled"
from rpython.jit.metainterp.optimizeopt.vector import optimize_vector
loop_info, loop_ops = optimize_vector(metainterp_sd,
jitdriver_sd, warmstate,
diff --git a/rpython/jit/metainterp/opencoder.py
b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -303,8 +303,6 @@
return TraceIterator(self, 0, len(self._ops))
def unpack(self):
- """ NOT_RPYTHON - really rpython, but only use for debugging
- """
iter = self.get_iter()
ops = []
while not iter.done():
diff --git a/rpython/jit/metainterp/pyjitpl.py
b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -2977,7 +2977,7 @@
if start_stack:
jitdriver_sd, key, pos = start_stack[0]
warmstate = jitdriver_sd.warmstate
- size = len(self.history.operations) - pos
+ size = self.history.get_trace_position()[0] - pos[0]
if size > max_size:
if warmstate is not None:
r = warmstate.get_location_str(key)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
