Clean up driver

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@492 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 21 insertions, 34 deletions

diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index 7bf820f..b71e8c1 100644
--- a/tools/llc/llc.cpp
+++ b/tools/llc/llc.cpp
@@ -11,55 +11,44 @@
 // 
 //**************************************************************************/
 
-#include "llvm/Module.h"
-#include "llvm/Method.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Optimizations/Normalize.h"
 #include "llvm/CodeGen/InstrSelection.h"
 #include "llvm/CodeGen/InstrScheduling.h"
 #include "llvm/CodeGen/Sparc.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Module.h"
+#include "llvm/Method.h"
 
 cl::String InputFilename ("", "Input filename", cl::NoFlags, "-");
 cl::String OutputFilename("o", "Output filename", cl::NoFlags, "");
 
 
-void
-NormalizeMethod(Method* method)
-{
+static void NormalizeMethod(Method* method) {
   NormalizePhiConstantArgs(method);
 }
 
 
-static bool
-CompileModule(Module *M, TargetMachine &target)
-{
-  bool failed = false;
-  
-  for (Module::const_iterator MI = M->begin(), ME = M->end(); MI != ME; ++MI)
-    {
-      Method* method = *MI;
+static bool CompileModule(Module *M, TargetMachine &Target) {
+  for (Module::const_iterator MI = M->begin(), ME = M->end(); MI != ME; ++MI) {
+    Method *Meth = *MI;
       
-      NormalizeMethod(method);
+    NormalizeMethod(Meth);
       
-      failed = SelectInstructionsForMethod(method, target);
-      if (failed)
-	{
-	  cerr << "Instruction selection failed for method "
-	       << method->getName() << "\n\n";
-	  break;
-	}
+    if (SelectInstructionsForMethod(Meth, Target)) {
+      cerr << "Instruction selection failed for method "
+	   << Meth->getName() << "\n\n";
+      return true;
+    }
 
-      failed = ScheduleInstructionsWithSSA(method, target);
-      if (failed)
-	{
-	  cerr << "Instruction scheduling before allocation failed for method "
-	       << method->getName() << "\n\n";
-	  break;
-	}
+    if (ScheduleInstructionsWithSSA(Meth, Target)) {
+      cerr << "Instruction scheduling before allocation failed for method "
+	   << Meth->getName() << "\n\n";
+      return true;
     }
+  }
   
-  return failed;
+  return false;
 }
 
 
@@ -70,11 +59,9 @@ CompileModule(Module *M, TargetMachine &target)
 // Entry point for the llc compiler.
 //---------------------------------------------------------------------------
 
-int
-main(int argc, char** argv)
-{
+int main(int argc, char** argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm system compiler\n");
-  UltraSparc target;
+  UltraSparc Target;
   
   Module *module = ParseBytecodeFile(InputFilename);
   if (module == 0) {
@@ -82,7 +69,7 @@ main(int argc, char** argv)
     return 1;
   }
 
-  if (CompileModule(module, target)) {
+  if (CompileModule(module, Target)) {
     cerr << "Error compiling " << InputFilename << "!\n";
     delete module;
     return 1;