[pypy-commit] jitviewer default: some progress. Disable css_class because it's outrageous

[fijal]

Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: 
Changeset: r181:18fe3ae6deff
Date: 2011-12-27 11:42 +0200
http://bitbucket.org/pypy/jitviewer/changeset/18fe3ae6deff/

Log:    some progress. Disable css_class because it's outrageous

diff --git a/_jitviewer/parser.py b/_jitviewer/parser.py
--- a/_jitviewer/parser.py
+++ b/_jitviewer/parser.py
@@ -46,8 +46,8 @@
         s = getattr(self, 'repr_' + self.name, self.repr)()
         return Html(s)
 
-    def _getvar(self, v):
-        return cssclass(v, v, onmouseover='highlight_var(this)', 
onmouseout='disable_var(this)')
+    #def _getvar(self, v):
+    #    return cssclass(v, v, onmouseover='highlight_var(this)', 
onmouseout='disable_var(this)')
 
     for bin_op, name in [('==', 'int_eq'),
                          ('!=', 'int_ne'),
diff --git a/templates/loop.html b/templates/loop.html
--- a/templates/loop.html
+++ b/templates/loop.html
@@ -10,18 +10,20 @@
               {% for chunk in sourceline.chunks %}
                  {% if chunk.is_bytecode %}
                    <span 
class="{{chunk.cssclass}}">{{chunk.html_repr()}}</span><br/>
-                   {% for op in chunk.operations[1:] %}
-                      {% if op.bridge %}
-                        <span id="loop-{{op.bridge.no}}" class="guard 
single-operation">{{op.html_repr()}}</span> <a href="/" 
onClick="replace_from(this, {{op.bridge.no}}); return false">&gt;&gt;show 
bridge</a> (taken {{op.percentage}}%)<br/>
-                        {% if op.asm %}
-                          <p class="asm">{{op.asm}}</p>
+                   {% for op in chunk.operations %}
+                      {% if op.name != "debug_merge_point" %}
+                        {% if op.bridge %}
+                          <span id="loop-{{op.bridge.no}}" class="guard 
single-operation">{{op.html_repr()}}</span> <a href="/" 
onClick="replace_from(this, {{op.bridge.no}}); return false">&gt;&gt;show 
bridge</a> (taken {{op.percentage}}%)<br/>
+                          {% if op.asm %}
+                            <p class="asm">{{op.asm}}</p>
+                          {% endif %}
+                        {% else %}
+                          <span 
class="{{op.html_class()}}">{{op.html_repr()}}</span><br/>
+                          {% if op.asm %}
+                              <p class="asm">{{op.asm}}</p>
+                          {% endif %}
                         {% endif %}
-                      {% else %}
-                        <span 
class="{{op.html_class()}}">{{op.html_repr()}}</span><br/>
-                        {% if op.asm %}
-                            <p class="asm">{{op.asm}}</p>
-                        {% endif %}
-                      {% endif %}
+                     {% endif %}
                    {% endfor %}
                  {% else %}
                    <a class="inlined_call" 
onClick="show_loop({{current_loop}}, '{{chunk.path}}'); return false" 
href="/">{{(chunk.html_repr())|safe}}</a><br/>
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit