Increase odds that this won't bork things

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

diff --git a/tools/gccas/gccas.cpp b/tools/gccas/gccas.cpp
index 31f7e6e813b135f588702c44b90ed62047f2b982..1cefa371b6ce6c1dba779986be23b09b2533844c 100644 (file)
--- a/tools/gccas/gccas.cpp
+++ b/tools/gccas/gccas.cpp
@@ -21,25 +21,23 @@
 #include "Support/Signals.h"
 #include <memory>
 #include <fstream>
-using std::cerr;
 
-// FIXME: This should eventually be parameterized...
-static TargetData TD("opt target");
+namespace {
+  cl::opt<std::string>
+  InputFilename(cl::Positional,cl::desc("<input llvm assembly>"),cl::init("-"));
 
-static cl::opt<std::string>
-InputFilename(cl::Positional, cl::desc("<input llvm assembly>"), cl::Required);
+  cl::opt<std::string> 
+  OutputFilename("o", cl::desc("Override output filename"),
+                 cl::value_desc("filename"));
 
-static cl::opt<std::string> 
-OutputFilename("o", cl::desc("Override output filename"),
-               cl::value_desc("filename"));
+  cl::opt<int>
+  RunNPasses("stopAfterNPasses",
+             cl::desc("Only run the first N passes of gccas"), cl::Hidden,
+             cl::value_desc("# passes"));
 
-static cl::opt<int>
-RunNPasses("stopAfterNPasses",
-           cl::desc("Only run the first N passes of gccas"), cl::Hidden,
-           cl::value_desc("# passes"));
-
-static cl::opt<bool>   
-Verify("verify", cl::desc("Verify each pass result"));
+  cl::opt<bool>   
+  Verify("verify", cl::desc("Verify each pass result"));
+}
 
 
 static inline void addPass(PassManager &PM, Pass *P) {
@@ -68,15 +66,17 @@ void AddConfiguredTransformationPasses(PassManager &PM) {
   addPass(PM, createGlobalDCEPass());            // Kill unused uinit g-vars
   addPass(PM, createDeadTypeEliminationPass());  // Eliminate dead types
   addPass(PM, createConstantMergePass());        // Merge dup global constants
+  addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
   addPass(PM, createVerifierPass());             // Verify that input is correct
   addPass(PM, createDeadInstEliminationPass());  // Remove Dead code/vars
   addPass(PM, createRaiseAllocationsPass());     // call %malloc -> malloc inst
+  addPass(PM, createInstructionCombiningPass()); // Cleanup code for raise
   addPass(PM, createIndVarSimplifyPass());       // Simplify indvars
-  addPass(PM, createRaisePointerReferencesPass(TD));// Recover type information
+  addPass(PM, createRaisePointerReferencesPass());// Recover type information
   addPass(PM, createInstructionCombiningPass()); // Combine silly seq's
   addPass(PM, createPromoteMemoryToRegister());  // Promote alloca's to regs
   addPass(PM, createReassociatePass());          // Reassociate expressions
-  addPass(PM, createCorrelatedExpressionEliminationPass());// Kill corr branches
+  //addPass(PM, createCorrelatedExpressionEliminationPass());// Kill corr branches
   addPass(PM, createInstructionCombiningPass()); // Combine silly seq's
   addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
   addPass(PM, createLICMPass());                 // Hoist loop invariants
@@ -100,49 +100,66 @@ int main(int argc, char **argv) {
     // Parse the file now...
     M.reset(ParseAssemblyFile(InputFilename));
   } catch (const ParseException &E) {
-    cerr << argv[0] << ": " << E.getMessage() << "\n";
+    std::cerr << argv[0] << ": " << E.getMessage() << "\n";
     return 1;
   }
 
   if (M.get() == 0) {
-    cerr << argv[0] << ": assembly didn't read correctly.\n";
+    std::cerr << argv[0] << ": assembly didn't read correctly.\n";
     return 1;
   }
-  
+
+  std::ostream *Out = 0;
   if (OutputFilename == "") {   // Didn't specify an output filename?
-    std::string IFN = InputFilename;
-    int Len = IFN.length();
-    if (IFN[Len-2] == '.' && IFN[Len-1] == 's') {   // Source ends in .s?
-      OutputFilename = std::string(IFN.begin(), IFN.end()-2);
+    if (InputFilename == "-") {
+      OutputFilename = "-";
     } else {
-      OutputFilename = IFN;   // Append a .o to it
+      std::string IFN = InputFilename;
+      int Len = IFN.length();
+      if (IFN[Len-2] == '.' && IFN[Len-1] == 's') {   // Source ends in .s?
+        OutputFilename = std::string(IFN.begin(), IFN.end()-2);
+      } else {
+        OutputFilename = IFN;   // Append a .o to it
+      }
+      OutputFilename += ".o";
     }
-    OutputFilename += ".o";
   }
 
-  std::ofstream Out(OutputFilename.c_str(), std::ios::out);
-  if (!Out.good()) {
-    cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
-    return 1;
+  if (OutputFilename == "-")
+    Out = &std::cout;
+  else {
+    Out = new std::ofstream(OutputFilename.c_str(), std::ios::out);
+
+    // Make sure that the Out file gets unlink'd from the disk if we get a
+    // signal
+    RemoveFileOnSignal(OutputFilename);
   }
 
-  // Make sure that the Out file gets unlink'd from the disk if we get a SIGINT
-  RemoveFileOnSignal(OutputFilename);
+  
+  if (!Out->good()) {
+    std::cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
+    return 1;
+  }
 
   // In addition to just parsing the input from GCC, we also want to spiff it up
   // a little bit.  Do this now.
   //
   PassManager Passes;
 
+  // Add an appropriate TargetData instance for this module...
+  Passes.add(new TargetData("gccas", M.get()));
+
   // Add all of the transformation passes to the pass manager to do the cleanup
   // and optimization of the GCC output.
   //
   AddConfiguredTransformationPasses(Passes);
 
   // Write bytecode to file...
-  Passes.add(new WriteBytecodePass(&Out));
+  Passes.add(new WriteBytecodePass(Out));
 
   // Run our queue of passes all at once now, efficiently.
   Passes.run(*M.get());
+
+  if (Out != &std::cout) delete Out;
   return 0;
 }