When an error occurs executing a tool, we now throw an exception instead

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

diff --git a/tools/llvm-as/llvm-as.cpp b/tools/llvm-as/llvm-as.cpp
index 3e8a9eaf31a6b56230b3f1c766b3e0402de79239..9be5afff116134165b76f36d36627cb0776cf94c 100644 (file)
--- a/tools/llvm-as/llvm-as.cpp
+++ b/tools/llvm-as/llvm-as.cpp
@@ -1,57 +1,85 @@
-//===------------------------------------------------------------------------===
-// LLVM 'AS' UTILITY 
+//===--- llvm-as.cpp - The low-level LLVM assembler -----------------------===//
+// 
+//                     The LLVM Compiler Infrastructure
 //
-//  This utility may be invoked in the following manner:
-//   as --help     - Output information about command line switches
-//   as [options]      - Read LLVM assembly from stdin, write bytecode to stdout
-//   as [options] x.ll - Read LLVM assembly from the x.ll file, write bytecode
-//                       to the x.bc file.
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// 
+//===----------------------------------------------------------------------===//
 //
+//  This utility may be invoked in the following manner:
+//   llvm-as --help         - Output information about command line switches
+//   llvm-as [options]      - Read LLVM asm from stdin, write bytecode to stdout
+//   llvm-as [options] x.ll - Read LLVM asm from the x.ll file, write bytecode
+//                            to the x.bc file.
+// 
 //===------------------------------------------------------------------------===
 
 #include "llvm/Module.h"
 #include "llvm/Assembly/Parser.h"
 #include "llvm/Bytecode/Writer.h"
+#include "llvm/Analysis/Verifier.h"
 #include "Support/CommandLine.h"
 #include "Support/Signals.h"
 #include <fstream>
-#include <string>
 #include <memory>
 
-cl::String InputFilename ("", "Parse <arg> file, compile to bytecode", 0, "-");
-cl::String OutputFilename("o", "Override output filename", cl::NoFlags, "");
-cl::Flag   Force         ("f", "Overwrite output files", cl::NoFlags, false);
-cl::Flag   DumpAsm       ("d", "Print assembly as parsed", cl::Hidden, false);
+using namespace llvm;
+
+static cl::opt<std::string> 
+InputFilename(cl::Positional, cl::desc("<input .llvm file>"), cl::init("-"));
+
+static cl::opt<std::string>
+OutputFilename("o", cl::desc("Override output filename"),
+               cl::value_desc("filename"));
+
+static cl::opt<bool>
+Force("f", cl::desc("Overwrite output files"));
+
+static cl::opt<bool>
+DumpAsm("d", cl::desc("Print assembly as parsed"), cl::Hidden);
+
+static cl::opt<bool>
+DisableVerify("disable-verify", cl::Hidden,
+              cl::desc("Do not run verifier on input LLVM (dangerous!"));
 
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm .ll -> .bc assembler\n");
 
-  ostream *Out = 0;
+  std::ostream *Out = 0;
   try {
     // Parse the file now...
     std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename));
     if (M.get() == 0) {
-      cerr << "assembly didn't read correctly.\n";
+      std::cerr << argv[0] << ": assembly didn't read correctly.\n";
       return 1;
     }
-  
-    if (DumpAsm) {
-      cerr << "Here's the assembly:\n";
-      M.get()->dump();
+
+    if (!DisableVerify && verifyModule(*M.get())) {
+      std::cerr << argv[0]
+                << ": assembly parsed, but does not verify as correct!\n";
+      return 1;
     }
+  
+    if (DumpAsm) std::cerr << "Here's the assembly:\n" << M.get();
 
     if (OutputFilename != "") {   // Specified an output filename?
-      if (!Force && std::ifstream(OutputFilename.c_str())) {
-        // If force is not specified, make sure not to overwrite a file!
-        cerr << "Error opening '" << OutputFilename << "': File exists!\n"
-             << "Use -f command line argument to force output\n";
-        return 1;
+      if (OutputFilename != "-") {  // Not stdout?
+        if (!Force && std::ifstream(OutputFilename.c_str())) {
+          // If force is not specified, make sure not to overwrite a file!
+          std::cerr << argv[0] << ": error opening '" << OutputFilename
+                    << "': file exists!\n"
+                    << "Use -f command line argument to force output\n";
+          return 1;
+        }
+        Out = new std::ofstream(OutputFilename.c_str());
+      } else {                      // Specified stdout
+       Out = &std::cout;       
       }
-      Out = new std::ofstream(OutputFilename.c_str());
     } else {
       if (InputFilename == "-") {
        OutputFilename = "-";
-       Out = &cout;
+       Out = &std::cout;
       } else {
        std::string IFN = InputFilename;
        int Len = IFN.length();
@@ -65,30 +93,31 @@ int main(int argc, char **argv) {
 
         if (!Force && std::ifstream(OutputFilename.c_str())) {
           // If force is not specified, make sure not to overwrite a file!
-          cerr << "Error opening '" << OutputFilename << "': File exists!\n"
-               << "Use -f command line argument to force output\n";
+          std::cerr << argv[0] << ": error opening '" << OutputFilename
+                    << "': file exists!\n"
+                    << "Use -f command line argument to force output\n";
           return 1;
         }
 
        Out = new std::ofstream(OutputFilename.c_str());
-        // Make sure that the Out file gets unlink'd from the disk if we get a
+        // Make sure that the Out file gets unlinked from the disk if we get a
         // SIGINT
         RemoveFileOnSignal(OutputFilename);
       }
     }
   
     if (!Out->good()) {
-      cerr << "Error opening " << OutputFilename << "!\n";
+      std::cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
       return 1;
     }
    
     WriteBytecodeToFile(M.get(), *Out);
   } catch (const ParseException &E) {
-    cerr << E.getMessage() << endl;
+    std::cerr << argv[0] << ": " << E.getMessage() << "\n";
     return 1;
   }
 
-  if (Out != &cout) delete Out;
+  if (Out != &std::cout) delete Out;
   return 0;
 }