Silly cleanup

[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 da956221199470fae5dc2f5ed4dce38e23233ca0..1dbcd1d1b839a5eddaea71479278b44b599070ec 100644 (file)
--- a/tools/llvm-as/llvm-as.cpp
+++ b/tools/llvm-as/llvm-as.cpp
@@ -1,24 +1,34 @@
-//===------------------------------------------------------------------------===
-// LLVM 'AS' UTILITY 
+//===--- llvm-as.cpp - The low-level LLVM assembler -----------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// 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 "llvm/Support/CommandLine.h"
+#include "llvm/Support/SystemUtils.h"
+#include "llvm/System/Signals.h"
 #include <fstream>
+#include <iostream>
 #include <memory>
 
-static cl::opt<std::string> 
+using namespace llvm;
+
+static cl::opt<std::string>
 InputFilename(cl::Positional, cl::desc("<input .llvm file>"), cl::init("-"));
 
 static cl::opt<std::string>
@@ -31,13 +41,19 @@ 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>
+NoCompress("disable-compression", cl::init(false),
+           cl::desc("Don't compress the generated bytecode"));
+
 static cl::opt<bool>
 DisableVerify("disable-verify", cl::Hidden,
-              cl::desc("Do not run verifier on input LLVM (dangerous!"));
+              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");
+  sys::PrintStackTraceOnErrorSignal();
 
+  int exitCode = 0;
   std::ostream *Out = 0;
   try {
     // Parse the file now...
@@ -47,13 +63,17 @@ int main(int argc, char **argv) {
       return 1;
     }
 
-    if (!DisableVerify && verifyModule(*M.get())) {
+    try {
+      if (!DisableVerify)
+        verifyModule(*M.get(), ThrowExceptionAction);
+    } catch (const std::string &Err) {
       std::cerr << argv[0]
                 << ": assembly parsed, but does not verify as correct!\n";
+      std::cerr << Err;
       return 1;
     }
-  
-    if (DumpAsm) std::cerr << "Here's the assembly:\n" << M.get();
+
+    if (DumpAsm) std::cerr << "Here's the assembly:\n" << *M.get();
 
     if (OutputFilename != "") {   // Specified an output filename?
       if (OutputFilename != "-") {  // Not stdout?
@@ -64,24 +84,26 @@ int main(int argc, char **argv) {
                     << "Use -f command line argument to force output\n";
           return 1;
         }
-        Out = new std::ofstream(OutputFilename.c_str());
+        Out = new std::ofstream(OutputFilename.c_str(), std::ios::out |
+                                std::ios::trunc | std::ios::binary);
       } else {                      // Specified stdout
-       Out = &std::cout;       
+        // FIXME: cout is not binary!
+        Out = &std::cout;
       }
     } else {
       if (InputFilename == "-") {
-       OutputFilename = "-";
-       Out = &std::cout;
+        OutputFilename = "-";
+        Out = &std::cout;
       } else {
-       std::string IFN = InputFilename;
-       int Len = IFN.length();
-       if (IFN[Len-3] == '.' && IFN[Len-2] == 'l' && IFN[Len-1] == 'l') {
-         // Source ends in .ll
-         OutputFilename = std::string(IFN.begin(), IFN.end()-3);
+        std::string IFN = InputFilename;
+        int Len = IFN.length();
+        if (IFN[Len-3] == '.' && IFN[Len-2] == 'l' && IFN[Len-1] == 'l') {
+          // Source ends in .ll
+          OutputFilename = std::string(IFN.begin(), IFN.end()-3);
         } else {
-         OutputFilename = IFN;   // Append a .bc to it
-       }
-       OutputFilename += ".bc";
+          OutputFilename = IFN;   // Append a .bc to it
+        }
+        OutputFilename += ".bc";
 
         if (!Force && std::ifstream(OutputFilename.c_str())) {
           // If force is not specified, make sure not to overwrite a file!
@@ -91,25 +113,34 @@ int main(int argc, char **argv) {
           return 1;
         }
 
-       Out = new std::ofstream(OutputFilename.c_str());
+        Out = new std::ofstream(OutputFilename.c_str(), std::ios::out |
+                                std::ios::trunc | std::ios::binary);
         // Make sure that the Out file gets unlinked from the disk if we get a
         // SIGINT
-        RemoveFileOnSignal(OutputFilename);
+        sys::RemoveFileOnSignal(sys::Path(OutputFilename));
       }
     }
-  
+
     if (!Out->good()) {
       std::cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
       return 1;
     }
-   
-    WriteBytecodeToFile(M.get(), *Out);
+
+    if (Force || !CheckBytecodeOutputToConsole(Out,true)) {
+      WriteBytecodeToFile(M.get(), *Out, !NoCompress);
+    }
   } catch (const ParseException &E) {
     std::cerr << argv[0] << ": " << E.getMessage() << "\n";
-    return 1;
+    exitCode = 1;
+  } catch (const std::string& msg) {
+    std::cerr << argv[0] << ": " << msg << "\n";
+    exitCode = 1;
+  } catch (...) {
+    std::cerr << argv[0] << ": Unexpected unknown exception occurred.\n";
+    exitCode = 1;
   }
 
   if (Out != &std::cout) delete Out;
-  return 0;
+  return exitCode;
 }