* eliminate the -f argument to lli, as it was silly and never useful anyway

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

diff --git a/tools/analyze/analyze.cpp b/tools/analyze/analyze.cpp
index 52ae6c88fabfcedd134a87f1cdf263aac1d20e2d..3e1e51600e8b2d85645220ece8f5d8992e2bde41 100644 (file)
--- a/tools/analyze/analyze.cpp
+++ b/tools/analyze/analyze.cpp
@@ -1,5 +1,11 @@
+//===- analyze.cpp - The LLVM analyze utility -----------------------------===//
+// 
+//                     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.
+// 
 //===----------------------------------------------------------------------===//
-// The LLVM analyze utility
 //
 // This utility is designed to print out the results of running various analysis
 // passes on a program.  This is useful for understanding a program, or for 
@@ -15,18 +21,19 @@
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Assembly/Parser.h"
 #include "llvm/Analysis/Verifier.h"
+#include "llvm/Target/TargetData.h"
 #include "llvm/Support/PassNameParser.h"
 #include "Support/Timer.h"
 #include <algorithm>
 
+using namespace llvm;
 
 struct ModulePassPrinter : public Pass {
   const PassInfo *PassToPrint;
   ModulePassPrinter(const PassInfo *PI) : PassToPrint(PI) {}
 
   virtual bool run(Module &M) {
-    std::cout << "Printing Analysis info for Pass "
-              << PassToPrint->getPassName() << ":\n";
+    std::cout << "Printing analysis '" << PassToPrint->getPassName() << "':\n";
     getAnalysisID<Pass>(PassToPrint).print(std::cout, &M);
     
     // Get and print pass...
@@ -46,8 +53,8 @@ struct FunctionPassPrinter : public FunctionPass {
   FunctionPassPrinter(const PassInfo *PI) : PassToPrint(PI) {}
 
   virtual bool runOnFunction(Function &F) {
-    std::cout << "Printing Analysis info for function '" << F.getName()
-              << "': Pass " << PassToPrint->getPassName() << ":\n";
+    std::cout << "Printing analysis '" << PassToPrint->getPassName()
+              << "' for function '" << F.getName() << "':\n";
     getAnalysisID<Pass>(PassToPrint).print(std::cout, F.getParent());
 
     // Get and print pass...
@@ -85,24 +92,26 @@ struct BasicBlockPassPrinter : public BasicBlockPass {
 
 
 
+namespace {
+  cl::opt<std::string>
+  InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-"),
+                cl::value_desc("filename"));
 
-static cl::opt<std::string>
-InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-"),
-              cl::value_desc("filename"));
+  cl::opt<bool> Quiet("q", cl::desc("Don't print analysis pass names"));
+  cl::alias    QuietA("quiet", cl::desc("Alias for -q"),
+                      cl::aliasopt(Quiet));
 
-static cl::opt<bool> Quiet("q", cl::desc("Don't print analysis pass names"));
-static cl::alias    QuietA("quiet", cl::desc("Alias for -q"),
-                           cl::aliasopt(Quiet));
-
-// The AnalysesList is automatically populated with registered Passes by the
-// PassNameParser.
-//
-static cl::list<const PassInfo*, bool,
-                FilteredPassNameParser<PassInfo::Analysis> >
-AnalysesList(cl::desc("Analyses available:"));
+  cl::opt<bool> NoVerify("disable-verify", cl::Hidden,
+                         cl::desc("Do not verify input module"));
 
+  // The AnalysesList is automatically populated with registered Passes by the
+  // PassNameParser.
+  //
+  cl::list<const PassInfo*, bool, FilteredPassNameParser<PassInfo::Analysis> >
+  AnalysesList(cl::desc("Analyses available:"));
 
-static Timer BytecodeLoadTimer("Bytecode Loader");
+  Timer BytecodeLoadTimer("Bytecode Loader");
+}
 
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm analysis printer tool\n");
@@ -127,8 +136,12 @@ int main(int argc, char **argv) {
   //
   PassManager Passes;
 
+  // Add an appropriate TargetData instance for this module...
+  Passes.add(new TargetData("analyze", CurMod));
+
   // Make sure the input LLVM is well formed.
-  Passes.add(createVerifierPass());
+  if (!NoVerify)
+    Passes.add(createVerifierPass());
 
   // Create a new optimization pass for each one specified on the command line
   for (unsigned i = 0; i < AnalysesList.size(); ++i) {