Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r74433:95244fa2d0d2
Date: 2014-11-10 21:44 +0100
http://bitbucket.org/pypy/pypy/changeset/95244fa2d0d2/
Log: minor fixes for jit_debug
diff --git a/rpython/jit/metainterp/optimizeopt/heap.py
b/rpython/jit/metainterp/optimizeopt/heap.py
--- a/rpython/jit/metainterp/optimizeopt/heap.py
+++ b/rpython/jit/metainterp/optimizeopt/heap.py
@@ -273,6 +273,7 @@
opnum == rop.STRSETITEM or # no effect on GC struct/array
opnum == rop.UNICODESETITEM or # no effect on GC struct/array
opnum == rop.DEBUG_MERGE_POINT or # no effect whatsoever
+ opnum == rop.JIT_DEBUG or # no effect whatsoever
opnum == rop.COPYSTRCONTENT or # no effect on GC struct/array
opnum == rop.COPYUNICODECONTENT): # no effect on GC struct/array
return
diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py
b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -660,6 +660,9 @@
def optimize_DEBUG_MERGE_POINT(self, op):
self.emit_operation(op)
+ def optimize_JIT_DEBUG(self, op):
+ self.emit_operation(op)
+
def optimize_STRGETITEM(self, op):
indexvalue = self.getvalue(op.getarg(1))
if indexvalue.is_constant():
diff --git a/rpython/jit/tool/oparser.py b/rpython/jit/tool/oparser.py
--- a/rpython/jit/tool/oparser.py
+++ b/rpython/jit/tool/oparser.py
@@ -298,8 +298,9 @@
first_comment = None
for line in lines:
# for simplicity comments are not allowed on
- # debug_merge_point lines
- if '#' in line and 'debug_merge_point(' not in line:
+ # debug_merge_point or jit_debug lines
+ if '#' in line and ('debug_merge_point(' not in line and
+ 'jit_debug(' not in line):
if line.lstrip()[0] == '#': # comment only
if first_comment is None:
first_comment = line
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
