[llvm-commits] CVS: reopt/lib/Trigger/RuntimeOptimizations.cpp Trigger.cpp TriggerAuxillary.cpp TriggerAuxillary.h

[Brian Gaeke]

Changes in directory reopt/lib/Trigger:

RuntimeOptimizations.cpp updated: 1.3 -> 1.4
Trigger.cpp updated: 1.22 -> 1.23
TriggerAuxillary.cpp updated: 1.8 -> 1.9
TriggerAuxillary.h updated: 1.4 -> 1.5

---
Log message:

Put reoptimizer code into 'llvm' namespace.
Other minor cleanups.


---
Diffs of the changes:  (+17 -1)

Index: reopt/lib/Trigger/RuntimeOptimizations.cpp
diff -u reopt/lib/Trigger/RuntimeOptimizations.cpp:1.3 reopt/lib/Trigger/RuntimeOptimizations.cpp:1.4
--- reopt/lib/Trigger/RuntimeOptimizations.cpp:1.3	Fri Aug 22 12:43:43 2003
+++ reopt/lib/Trigger/RuntimeOptimizations.cpp	Wed Nov 19 16:51:53 2003
@@ -15,6 +15,8 @@
 #include "llvm/Function.h"
 #include "TriggerAuxillary.h"
 
+namespace llvm {
+
 //remove all Trigger instrumentation code
 void removeInstrumentation(Function *F, LLVMTrace &ltrace, BinInterface &bin, 
 			   unsigned int secId, unsigned int cidOffset){
@@ -114,3 +116,5 @@
   //removeInstrumentation(F, ltrace, bin, totalSections, totalInstructions);
  
 }
+
+} // end namespace llvm


Index: reopt/lib/Trigger/Trigger.cpp
diff -u reopt/lib/Trigger/Trigger.cpp:1.22 reopt/lib/Trigger/Trigger.cpp:1.23
--- reopt/lib/Trigger/Trigger.cpp:1.22	Sat Sep 13 16:12:16 2003
+++ reopt/lib/Trigger/Trigger.cpp	Wed Nov 19 16:51:53 2003
@@ -37,6 +37,8 @@
 using std::map;
 using std::pair;
 
+namespace llvm {
+
 extern int llvm_length;
 extern const unsigned char LLVMBytecode[];
 extern void** llvmFunctionTable[];
@@ -502,3 +504,5 @@
   std::cerr<<"-----------\n";
   //#endif
 }
+
+} // end namespace llvm


Index: reopt/lib/Trigger/TriggerAuxillary.cpp
diff -u reopt/lib/Trigger/TriggerAuxillary.cpp:1.8 reopt/lib/Trigger/TriggerAuxillary.cpp:1.9
--- reopt/lib/Trigger/TriggerAuxillary.cpp:1.8	Sat Sep 13 16:12:16 2003
+++ reopt/lib/Trigger/TriggerAuxillary.cpp	Wed Nov 19 16:51:53 2003
@@ -40,6 +40,8 @@
 using std::list;
 using std::pair;
 
+namespace llvm {
+
 extern int llvm_length;
 extern const unsigned char LLVMBytecode[];
 extern void** llvmFunctionTable[];
@@ -628,3 +630,5 @@
   }
   return false;
 }
+
+} // end namespace llvm


Index: reopt/lib/Trigger/TriggerAuxillary.h
diff -u reopt/lib/Trigger/TriggerAuxillary.h:1.4 reopt/lib/Trigger/TriggerAuxillary.h:1.5
--- reopt/lib/Trigger/TriggerAuxillary.h:1.4	Fri Aug 22 12:43:43 2003
+++ reopt/lib/Trigger/TriggerAuxillary.h	Wed Nov 19 16:51:53 2003
@@ -13,6 +13,8 @@
 #include <vector>
 #include <map>
 
+namespace llvm { 
+
 #define CONDBR 4
 #define UNCOND_BR 5
 #define UNROLL_FACTOR 1 //unroll ALL loops UNROLL_FACTOR times
@@ -25,7 +27,7 @@
 
 using std::vector;
 using std::map;
- 
+
 void getBBtrace(vector<BasicBlock *> &vBB, int pathNo, Function *M);
 
 void addToBinInterface(TraceCache *tr, VirtualMem *vm,
@@ -76,5 +78,7 @@
 bool isWellFormedLoop(vector<BasicBlock *> &vBB, Function *f);
 
 bool hasCall(vector<BasicBlock *> &vBB);
+
+} // end namespace llvm
 
 #endif