Extended the edis "IsBranch" property to call

instructions as well.  Added support for checking
this to the llvm-mc tester as well.

llvm-svn: 103454

2 files changed, 8 insertions, 1 deletions

diff --git a/llvm/tools/edis/EDInst.cpp b/llvm/tools/edis/EDInst.cpp
index af3a54abbcf..c009f0f8687 100644
--- a/llvm/tools/edis/EDInst.cpp
+++ b/llvm/tools/edis/EDInst.cpp
@@ -81,7 +81,9 @@ unsigned EDInst::instID() {
 
 bool EDInst::isBranch() {
   if (ThisInstInfo)
-    return ThisInstInfo->instructionType == kInstructionTypeBranch;
+    return 
+      ThisInstInfo->instructionType == kInstructionTypeBranch ||
+      ThisInstInfo->instructionType == kInstructionTypeCall;
   else
     return false;
 }
diff --git a/llvm/tools/llvm-mc/Disassembler.cpp b/llvm/tools/llvm-mc/Disassembler.cpp
index e2120c25d3a..37b2cb80563 100644
--- a/llvm/tools/llvm-mc/Disassembler.cpp
+++ b/llvm/tools/llvm-mc/Disassembler.cpp
@@ -314,6 +314,11 @@ int Disassembler::disassembleEnhanced(const std::string &TS,
   }
   
   outs() << " ";
+    
+  if (EDInstIsBranch(inst))
+    outs() << "<br> ";
+  if (EDInstIsMove(inst))
+    outs() << "<mov> ";
   
   int numOperands = EDNumOperands(inst);