[llvm-commits] [llvm] r103454 - in /llvm/trunk/tools: edis/EDInst.cpp llvm-mc/Disassembler.cpp

[Sean Callanan]

Author: spyffe
Date: Mon May 10 20:27:08 2010
New Revision: 103454

URL: http://llvm.org/viewvc/llvm-project?rev=103454&view=rev
Log:
Extended the edis "IsBranch" property to call
instructions as well.  Added support for checking
this to the llvm-mc tester as well.

Modified:
    llvm/trunk/tools/edis/EDInst.cpp
    llvm/trunk/tools/llvm-mc/Disassembler.cpp

Modified: llvm/trunk/tools/edis/EDInst.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/edis/EDInst.cpp?rev=103454&r1=103453&r2=103454&view=diff
==============================================================================
--- llvm/trunk/tools/edis/EDInst.cpp (original)
+++ llvm/trunk/tools/edis/EDInst.cpp Mon May 10 20:27:08 2010
@@ -81,7 +81,9 @@
 
 bool EDInst::isBranch() {
   if (ThisInstInfo)
-    return ThisInstInfo->instructionType == kInstructionTypeBranch;
+    return 
+      ThisInstInfo->instructionType == kInstructionTypeBranch ||
+      ThisInstInfo->instructionType == kInstructionTypeCall;
   else
     return false;
 }

Modified: llvm/trunk/tools/llvm-mc/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/Disassembler.cpp?rev=103454&r1=103453&r2=103454&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/Disassembler.cpp (original)
+++ llvm/trunk/tools/llvm-mc/Disassembler.cpp Mon May 10 20:27:08 2010
@@ -314,6 +314,11 @@
   }
   
   outs() << " ";
+    
+  if (EDInstIsBranch(inst))
+    outs() << "<br> ";
+  if (EDInstIsMove(inst))
+    outs() << "<mov> ";
   
   int numOperands = EDNumOperands(inst);