display vtable in type information part 2

Author: Dorothy Chen

app/die_information.py

@@ -15,6 +15,7 @@
 from elftools.dwarf.die import DIE
 
 from dwarf_expr import describe_DWARF_expr
+from disasm_demangler import demangle
 
 # Maps of each DIE offset to the corresponding DIE.
 # Used when trying to follow DIE type references, i.e., a DW_TAG_typedef DIE that has a DW_AT_type
@@ -231,7 +232,7 @@ def isType(die, typeName):
 
 def getVtable(typeDie):
     global die_list
-    vtable = {}
+    vtable = []
     for child in typeDie.iter_children():
         if child.tag == 'DW_TAG_subprogram' \
         and child.attributes.get('DW_AT_virtuality') \
@@ -246,7 +247,7 @@ def getVtable(typeDie):
                     name = child.attributes.get('DW_AT_name').value
                 else:
                     name = "(Cannot determine name)"
-                vtable[index] = name
+                vtable.append({"index": index, "name": demangle(name)});
             elif elem_location.form == 'DW_FORM_loclistptr':
                 print 'Cannot currently handle form DW_FORM_loclistptr'
             else:

app/static/js/disassemble.js

@@ -65,6 +65,10 @@ rivets.formatters.displayData = function(data) {
   return data != null && data != undefined;
 }
 
+rivets.formatters.arrHasContent = function(arr) {
+  return arr != undefined && arr.constructor === Array && arr.length > 0;
+}
+
 var rivetsAnalysisView = rivets.bind($('#tab-type-info'),
   {type_ctrl: type_ctrl}
 );

app/static/scss/disassemble.scss

@@ -648,5 +648,20 @@ $type-bg: rgb(178,223,219);
 			}
 		}
 	}
+
+	.vtable {
+		.vtable-header span {
+			font-family: "Open Sans";
+		}
+
+		.vtable-index {
+			text-align: right;
+		}
+		.vtable-function {
+			text-align: left;
+		}
+	}
 }
 
+
+

app/templates/type_search.partial.html

@@ -15,7 +15,8 @@
     rv-on-click="type_ctrl.selectedTypeClicked"></span>
   </div>
   <div class="type-attr">Tag: <span rv-text="type_ctrl.selected_type.tag"></span></div>
-  <div class="members">Members:
+  <div class="members type-attr"
+    rv-show="type_ctrl.selected_type.members | arrHasContent">Members:
     <span class='change-all collapse-all'>collapse all</span>
     <span class='change-all expand-all'>expand all</span>
     <ul>
@@ -57,9 +58,23 @@
         rv-hide="member.type | displayData">(type unknown)</span>
         <span class="type-modifiers"
         rv-show="member.modifiers"
-        rv-text="member.modifiers">>
+        rv-text="member.modifiers">
       </li>
     </ul>
+  </div> <!-- end members -->
+
+  <div class="vtable type-attr" 
+    rv-show="type_ctrl.selected_type.vtable | arrHasContent">
+    Vtable:
+    <div class='vtable-header row'>
+      <span class="vtable-index one column">Slot</span>
+      <span class="vtable-function eight columns">Function</span>
+    </div>
+    <div class='vtable-entry entry row'
+      rv-each-vtableentry='type_ctrl.selected_type.vtable'>
+      <span class='vtable-index one column'>{vtableentry.index}</span>
+      <span class='vtable-function eight columns'>{vtableentry.name}</span>
+    </div>
   </div>
 </div>