[llvm-commits] CVS: reopt/tools/dumptrace/dumptrace.cpp

[Brian Gaeke]

Changes in directory reopt/tools/dumptrace:

dumptrace.cpp updated: 1.1 -> 1.2

---
Log message:

Trim and sort #includes in both these source files.
Both these tools now use the trace reader from the traceIO library.


---
Diffs of the changes:  (+3 -76)

Index: reopt/tools/dumptrace/dumptrace.cpp
diff -u reopt/tools/dumptrace/dumptrace.cpp:1.1 reopt/tools/dumptrace/dumptrace.cpp:1.2
--- reopt/tools/dumptrace/dumptrace.cpp:1.1	Tue Jun 29 16:56:14 2004
+++ reopt/tools/dumptrace/dumptrace.cpp	Wed Jun 30 01:33:15 2004
@@ -14,19 +14,14 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "Support/CommandLine.h"
 #include "llvm/Analysis/Trace.h"
-#include "llvm/Analysis/Verifier.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Bytecode/Reader.h"
-#include "reopt/TraceToFunction.h"
 #include "llvm/Module.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
-#include "Support/StringExtras.h"
-#include <iostream>
-#include <iterator>
+#include "reopt/TraceIO.h"
 #include <fstream>
-#include <cerrno>
+#include <iostream>
 using namespace llvm;
 
 namespace {
@@ -38,74 +33,6 @@
     cl::value_desc("bytecodeFileName"));
 };
 
-//----------------------------------------------------------------------------//
-
-namespace {
-  cl::opt<bool> Quiet("q", cl::desc("Be quiet"), cl::init(false));
-};
-
-/// getBasicBlockByNum - Returns the basic block in F whose index is
-/// bbNum.
-///
-BasicBlock *getBasicBlockByNum (Function *F, int bbNum) {
-  Function::iterator block = F->begin();
-  std::advance (block, bbNum);
-  return block;
-}
-
-/// ReadTraceFromFile - Given a module, read a trace for some function
-/// in that module from the named file. Returns the Trace object, or a null
-/// pointer (and sets ErrorStr) if there was an error.
-///
-Trace *ReadTraceFromFile (Module *M, const std::string &filename,
-                          std::string *ErrorStr) {
-  std::ifstream in (filename.c_str ());
-  if (!in.good()) {
-    if (ErrorStr)
-      *ErrorStr = std::string("Can't open '") + filename + "': "
-                + strerror(errno);
-    return 0;
-  }
-  char functionName[160];
-  in.getline(functionName, 160, '\n');
-  Function *F = M->getNamedFunction (functionName);
-  if (!F) {
-    if (ErrorStr)
-      *ErrorStr = std::string("Function '") + functionName
-                + "' not found in module";
-    return 0;
-  }
-  if (!Quiet)
-    std::cerr << "Function name: '" << functionName << "'\n"
-              << "Basic blocks: ";
-  std::vector<BasicBlock *> vBB;
-  do {
-    int basicBlockNum;
-    in >> basicBlockNum;
-    if (!in.eof ()) {
-      if (!Quiet) std::cerr << basicBlockNum << " ";
-      vBB.push_back (getBasicBlockByNum (F, basicBlockNum));
-    }
-  } while (!in.eof ());
-  if (!Quiet) std::cerr << "\n";
-  return new Trace (vBB);
-}
-
-/// getBasicBlockIndex - Returns the index of BB in its parent function.
-///
-int getBasicBlockIndex (BasicBlock *BB) {
-  int bbNum = 0;
-  Function *F = BB->getParent ();
-  Function::iterator block = F->begin();
-  while (&*block != BB) {
-    ++block;
-    ++bbNum;
-  }
-  return bbNum;
-}
-
-//----------------------------------------------------------------------------//
-
 int main (int argc, char **argv) {
   // Get command line arguments.
   cl::ParseCommandLineOptions(argc, argv, " trace basic block dumper\n");