Make sure to create a target data that matches the Module's target properties.

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

diff --git a/tools/analyze/analyze.cpp b/tools/analyze/analyze.cpp
index eb78d915b449096bd81826f543d83b6ad35fda3a..1119fccfa3340cc98f03005a818b7b1bcd41d6b7 100644 (file)
--- a/tools/analyze/analyze.cpp
+++ b/tools/analyze/analyze.cpp
@@ -15,7 +15,9 @@
 #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>
 
 
@@ -24,13 +26,14 @@ struct ModulePassPrinter : public Pass {
   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...
     return false;
   }
+  
+  virtual const char *getPassName() const { return "'Pass' Printer"; }
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.addRequiredID(PassToPrint);
@@ -43,14 +46,16 @@ 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...
     return false;
   }
 
+  virtual const char *getPassName() const { return "FunctionPass Printer"; }
+
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.addRequiredID(PassToPrint);
     AU.setPreservesAll();
@@ -70,6 +75,8 @@ struct BasicBlockPassPrinter : public BasicBlockPass {
     return false;
   }
 
+  virtual const char *getPassName() const { return "BasicBlockPass Printer"; }
+
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.addRequiredID(PassToPrint);
     AU.setPreservesAll();
@@ -95,11 +102,16 @@ static cl::list<const PassInfo*, bool,
 AnalysesList(cl::desc("Analyses available:"));
 
 
+static Timer BytecodeLoadTimer("Bytecode Loader");
+
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm analysis printer tool\n");
 
   Module *CurMod = 0;
   try {
+#if 0
+    TimeRegion RegionTimer(BytecodeLoadTimer);
+#endif
     CurMod = ParseBytecodeFile(InputFilename);
     if (!CurMod && !(CurMod = ParseAssemblyFile(InputFilename))){
       std::cerr << argv[0] << ": input file didn't read correctly.\n";
@@ -115,6 +127,9 @@ 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());