Instead of adding stdlib we just prototype malloc correctly.

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

diff --git a/tools/llvm-as/as.cpp b/tools/llvm-as/as.cpp
index 2c319a084919dece872616b97724fe0a58de86d7..c9bd3b4e08c05a6d7bc5ebb71b66a1fdb40d5216 100644 (file)
--- a/tools/llvm-as/as.cpp
+++ b/tools/llvm-as/as.cpp
@@ -6,80 +6,104 @@
 //   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.
-//
+// 
 //===------------------------------------------------------------------------===
 
-#include <iostream.h>
-#include <fstream.h>
-#include <string>
 #include "llvm/Module.h"
 #include "llvm/Assembly/Parser.h"
-#include "llvm/Assembly/Writer.h"
 #include "llvm/Bytecode/Writer.h"
-#include "llvm/Tools/CommandLine.h"
+#include "llvm/Analysis/Verifier.h"
+#include "Support/CommandLine.h"
+#include "Support/Signals.h"
+#include <fstream>
+#include <memory>
+using std::cerr;
+using std::string;
 
+static cl::opt<string> 
+InputFilename(cl::Positional, cl::desc("<input .llvm file>"), cl::init("-"));
 
-int main(int argc, char **argv) {
-  ToolCommandLine Opts(argc, argv);
-  bool DumpAsm = false;
+static cl::opt<string>
+OutputFilename("o", cl::desc("Override output filename"),
+               cl::value_desc("filename"));
 
-  for (int i = 1; i < argc; i++) {
-    if (string(argv[i]) == string("-d")) {
-      argv[i] = 0; DumpAsm = true;
-    }
-  }
+static cl::opt<bool>
+Force("f", cl::desc("Overwrite output files"));
 
-  bool PrintMessage = false;
-  for (int i = 1; i < argc; i++) {
-    if (argv[i] == 0) continue;
+static cl::opt<bool>
+DumpAsm("d", cl::desc("Print assembly as parsed"), cl::Hidden);
 
-    if (string(argv[i]) == string("--help")) {
-      PrintMessage = true;
-    } else {
-      cerr << argv[0] << ": argument not recognized: '" << argv[i] << "'!\n";
-    }
-  }
-
-  if (PrintMessage) {
-    cerr << argv[0] << " usage:\n"
-         << "  " << argv[0] << " --help  - Print this usage information\n" 
-         << "  " << argv[0] << " x.ll    - Parse <x.ll> file and output "
-         << "bytecodes to x.bc\n"
-         << "  " << argv[0] << "         - Parse stdin and write to stdout.\n";
-    return 1;
-  }
+int main(int argc, char **argv) {
+  cl::ParseCommandLineOptions(argc, argv, " llvm .ll -> .bc assembler\n");
 
-  ostream *Out = &cout;    // Default to output to stdout...
+  std::ostream *Out = 0;
   try {
     // Parse the file now...
-    Module *C = ParseAssemblyFile(Opts);
-    if (C == 0) {
-      cerr << "assembly didn't read correctly.\n";
+    std::auto_ptr<Module> M(ParseAssemblyFile(InputFilename));
+    if (M.get() == 0) {
+      cerr << argv[0] << ": assembly didn't read correctly.\n";
       return 1;
     }
+
+    if (verifyModule(*M.get())) {
+      cerr << argv[0] << ": assembly parsed, but does not verify as correct!\n";
+      return 1;
+    }
+
   
-    if (DumpAsm) 
-      cerr << "Here's the assembly:\n" << C;
-  
-    if (Opts.getOutputFilename() != "-") {
-      Out = new ofstream(Opts.getOutputFilename().c_str(), 
-                        (Opts.getForce() ? 0 : ios::noreplace)|ios::out);
-      if (!Out->good()) {
-        cerr << "Error opening " << Opts.getOutputFilename() << "!\n";
-       delete C;
-       return 1;
+    if (DumpAsm) 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 << 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 {
+      if (InputFilename == "-") {
+       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);
+        } else {
+         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!
+          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
+        // SIGINT
+        RemoveFileOnSignal(OutputFilename);
       }
     }
+  
+    if (!Out->good()) {
+      cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
+      return 1;
+    }
    
-    WriteBytecodeToFile(C, *Out);
-
-    delete C;
+    WriteBytecodeToFile(M.get(), *Out);
   } catch (const ParseException &E) {
-    cerr << E.getMessage() << endl;
+    cerr << argv[0] << ": " << E.getMessage() << "\n";
     return 1;
   }
 
-  if (Out != &cout) delete Out;
+  if (Out != &std::cout) delete Out;
   return 0;
 }