[lnt][profile] Add support for X86-64 CFG view

[kristof.beyls]

LGTM, modulo considering a call instruction to be ending a basic block.
I don't know enough details about the X86_64 instruction set to judge whether the regular expressions are fully correct, but they look plausible to me.

lnt/server/ui/static/lnt_profile.js

116–117 ↗

(On Diff #100227)

A function call should not be considered as ending a basic block. We also don't do that for the other targets supported here (AArch64 and AArch32).

[eladcohen]

Fixed Kristof's comment - Thanks!

[eladcohen]

Thanks for the review!
Committed in r303853

lnt/trunk/lnt/server/ui/static/lnt_profile.js

AArch32T32JumpTargetRegexps: [
         [new RegExp("^\\s*b(?:(?:ne)|(?:eq)|(?:cs)|(?:cc)|(?:mi)|(?:pl)|(?:vs)|(?:vc)|(?:hi)|(?:ls)|(?:ge)|(?:lt)|(?:gt)|(?:le))(?:\\.[nw])?\\s+([^\\s]+)"), false],
         // branch unconditional:
         [new RegExp("^\\s*b(?:\\.[nw])?\\s+([^\\s]+)"), true],
         // cb(n)z
         [new RegExp("^\\s*cbn?z\\s+[^,]+,\\s*([^\\s]+)"), false]
         // TODO: add all control-flow-changing instructions.
     ],
 
+    X86_64JumpTargetRegexps: [
+        // (regexp, noFallThru?)
+        // branch conditional:
+        [new RegExp("^\\s*j(?:(?:a)|(?:ae)|(?:b)|(?:be)|(?:c)|(?:ecxz)|(?:rcxz)"
+                    "|(?:e)|(?:g)|(?:ge)|(?:l)|(?:le)|(?:na)|(?:nae)|(?:nb)"
+                    "|(?:nbe)|(?:nc)|(?:ne)|(?:ng)|(?:nge)|(?:nl)|(?:nle)"
+                    "|(?:no)|(?:np)|(?:ns)|(?:nz)|(?:o)|(?:p)|(?:pe)|(?:po)"
+                    "|(?:s)|(?:z))?\\s+([^\\s]+)"), false],
+        [new RegExp("^\\s*loop(?:(?:e)|(?:ne)|(?:nz)|(?:z))?\\s+([^\\s]+)"), false],
+        // branch unconditional:
+        [new RegExp("^\\s*jmp\\s+([^\\s]+)"), true],
+        // ret
+        [new RegExp("^\\s*retq"), true],
+    ],
+
     getJumpTargets: function(instruction, nextInstruction, cfg) {
         for(var i=0; i<this.jumpTargetRegexps.length; ++i) {
             var regexp = this.jumpTargetRegexps[i][0];
             var noFallThru = this.jumpTargetRegexps[i][1];
             var match = instruction.text.match(regexp);
             if (match) {
                 var targets = [];
                 if (!noFallThru && nextInstruction)
_display_cfg: function(instructionSet) {
         var profiledDisassembly = this.data;
         var instructionParser;
         if (this.instructionSet == 'aarch64') 
             instructionParser = new InstructionSetParser(
                 InstructionSetParser.prototype.AArch64JumpTargetRegexps);
         else if (this.instructionSet == 'aarch32t32')
             instructionParser = new InstructionSetParser(
                 InstructionSetParser.prototype.AArch32T32JumpTargetRegexps);
+        else if (this.instructionSet == 'X86-64')
+            instructionParser = new InstructionSetParser(
+                InstructionSetParser.prototype.X86_64JumpTargetRegexps);
+
         else {
             // Do not try to continue if we don't have support for
             // the requested instruction set.
             $(this.element).html(
                 '<center><i>There is no support (yet?) for reconstructing ' +
                 'the CFG for the<br>' +
                 this.instructionSet+' instruction set. :(.</i></center>');
             return;

lnt/trunk/lnt/server/ui/templates/v4_profile.html

   <div class="row-fluid toolbarrow" id="toolbar">
     <div class="span4">
       <b>View:</b>
       <select class="input-medium" id="view">
         <option value="straight">Straight</option>
         <option value="cfg-aarch64">Control-Flow Graph (AArch64)</option>
         <option value="cfg-aarch32t32">Control-Flow Graph (AArch32-T32)</option>
         <option value="cfg-aarch32a32">Control-Flow Graph (AArch32-A32)</option>
+        <option value="cfg-X86-64">Control-Flow Graph (X86-64)</option>
       </select>
     </div>
     <div class="span4">
       <b>Hottest instructions:</b>
       <button class="btn btn-small prev-btn-l"><i class="icon-backward"></i> Prev</button>
       <button class="btn btn-small next-btn-l">Next <i class="icon-forward"></i></button>
     </div>
     <div class="span4">