[llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp

[Brian Gaeke]

Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

SecondTrigger.cpp updated: 1.13 -> 1.14

---
Log message:

Remove several needless #includes and using directives.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp
diff -u llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.13 llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.14
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.13	Tue Aug 12 22:07:16 2003
+++ llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp	Tue Aug 12 22:31:53 2003
@@ -20,28 +20,17 @@
 #include "llvm/Reoptimizer/TraceCache.h"
 #include "llvm/Reoptimizer/GetTraceTime.h"
 #include "llvm/iTerminators.h"
-#include "llvm/Support/CFG.h"
-#include "llvm/Module.h"
-#include <sys/time.h>
-#include <sys/types.h>
-#include <cstdlib>
-#ifdef __sparc
 #include <libcpc.h>
-#endif
-
-using std::map;
-using std::vector;
-using std::pair;
 
 #define CALL 0x40000000
 
 static std::map<uint64_t, std::map<uint64_t, int> *> pathCounter;
 static std::map<uint64_t, int> totalCount;
 static std::map<uint64_t, int> exitCounter;
-static std::map<uint64_t, pair<long, long> > backOffCounters;
+static std::map<uint64_t, std::pair<long, long> > backOffCounters;
 
 extern "C" void llvm_first_trigger(int *cnt);
-extern void optimizeTrace (vector<BasicBlock *> &vBB, uint64_t a);
+extern void optimizeTrace (std::vector<BasicBlock *> &vBB, uint64_t a);
 
 std::map<uint64_t, uint64_t> firstTriggerAddr;
  
@@ -451,7 +440,8 @@
 /// address is START, construct in VBB a vector of LLVM BasicBlocks
 /// that represents the trace.
 ///
-void constructVBB (unsigned int path, uint64_t start, vector<BasicBlock *>&vBB){
+void constructVBB (unsigned int path, uint64_t start,
+                   std::vector<BasicBlock *> &vBB) {
   BasicBlock *bb;
   BasicBlock *startBB;
   // Get the first basic block by querying the mapping information.
@@ -523,7 +513,7 @@
   getPathIntersections(pathIntersections, paths);
 
   //use path 0 to form vBB
-  //vector<BasicBlock *> vBB;
+  //std::vector<BasicBlock *> vBB;
   //constructVBB (paths[0], start, vBB);
   //if (!vBB.empty()) { optimizeTrace (vBB, firstLevelTraceStartAddr); }
   //return;
@@ -948,7 +938,7 @@
   }
 }
 
-void getReturnCode(vector<unsigned int> &traces, int &index, uint64_t ret){
+void getReturnCode(std::vector<unsigned int> &traces, int &index, uint64_t ret){
   //sethi1
   unsigned int r1 = ((ret>>32)&(0xfffff000))>>10;
   unsigned int r2 = (ret>>32)&(0xfff);