Be a bit more efficient when processing the active and inactive

[oota-llvm.git] / tools / llvm-dis / llvm-dis.cpp

diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp
index 70f8f5103b4df83f0a0595ae78c54dab386eced6..ac8101b6c425c1fd29ac5eb2c933d8bb1c2bebf7 100644 (file)
--- a/tools/llvm-dis/llvm-dis.cpp
+++ b/tools/llvm-dis/llvm-dis.cpp
@@ -1,4 +1,4 @@
-//===----------------------------------------------------------------------===//
+//===-- llvm-dis.cpp - The low-level LLVM disassembler --------------------===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -6,8 +6,6 @@
 // the University of Illinois Open Source License. See LICENSE.TXT for details.
 // 
 //===----------------------------------------------------------------------===//
-// 
-// LLVM 'DIS' UTILITY 
 //
 // This utility may be invoked in the following manner:
 //  llvm-dis [options]      - Read LLVM bytecode from stdin, write asm to stdout
@@ -15,25 +13,19 @@
 //                            to the x.ll file.
 //  Options:
 //      --help   - Output information about command line switches
-//       -c      - Print C code instead of LLVM assembly
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
 #include "llvm/Bytecode/Reader.h"
-#include "llvm/Assembly/CWriter.h"
 #include "llvm/Assembly/PrintModulePass.h"
 #include "Support/CommandLine.h"
-#include "Support/Signals.h"
+#include "llvm/System/Signals.h"
 #include <fstream>
 #include <memory>
 
-// OutputMode - The different orderings to print basic blocks in...
-enum OutputMode {
-  llvm = 0,           // Generate LLVM assembly (the default)
-  c,                  // Generate C code
-};
+using namespace llvm;
 
 static cl::opt<std::string>
 InputFilename(cl::Positional, cl::desc("<input bytecode>"), cl::init("-"));
@@ -45,17 +37,22 @@ OutputFilename("o", cl::desc("Override output filename"),
 static cl::opt<bool>
 Force("f", cl::desc("Overwrite output files"));
 
-static cl::opt<enum OutputMode>
-WriteMode(cl::desc("Specify the output format:"),
-          cl::values(clEnumVal(llvm, "Output LLVM assembly"),
-                     clEnumVal(c   , "Output C code for program"),
-                    0));
+static cl::opt<bool>
+CWriteMode("c", cl::desc("Obsolete option, do not use"), cl::ReallyHidden);
 
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm .bc -> .ll disassembler\n");
+  sys::PrintStackTraceOnErrorSignal();
+
   std::ostream *Out = &std::cout;  // Default to printing to stdout...
   std::string ErrorMessage;
 
+  if (CWriteMode) {
+    std::cerr << "ERROR: llvm-dis no longer contains the C backend. "
+              << "Use 'llc -march=c' instead!\n";
+    exit(1);
+  }
+
   std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename, &ErrorMessage));
   if (M.get() == 0) {
     std::cerr << argv[0] << ": ";
@@ -84,14 +81,10 @@ int main(int argc, char **argv) {
       int Len = IFN.length();
       if (IFN[Len-3] == '.' && IFN[Len-2] == 'b' && IFN[Len-1] == 'c') {
        // Source ends in .bc
-       OutputFilename = std::string(IFN.begin(), IFN.end()-3);
+       OutputFilename = std::string(IFN.begin(), IFN.end()-3)+".ll";
       } else {
-       OutputFilename = IFN;   // Append a .ll to it
+       OutputFilename = IFN+".ll";
       }
-      if (WriteMode == c)
-        OutputFilename += ".c";
-      else
-        OutputFilename += ".ll";
 
       if (!Force && std::ifstream(OutputFilename.c_str())) {
         // If force is not specified, make sure not to overwrite a file!
@@ -102,7 +95,7 @@ int main(int argc, char **argv) {
 
         // Make sure that the Out file gets unlinked from the disk if we get a
         // SIGINT
-        RemoveFileOnSignal(OutputFilename);
+        sys::RemoveFileOnSignal(OutputFilename);
       }
     }
   }
@@ -116,16 +109,7 @@ int main(int argc, char **argv) {
   // All that dis does is write the assembly or C out to a file...
   //
   PassManager Passes;
-
-  switch (WriteMode) {
-  case llvm:           // Output LLVM assembly
-    Passes.add(new PrintModulePass(Out));
-    break;
-  case c:              // Convert LLVM to C
-    Passes.add(createWriteToCPass(*Out));
-    break;
-  }
-
+  Passes.add(new PrintModulePass(Out));
   Passes.run(*M.get());
 
   if (Out != &std::cout) {