[llvm-commits] CVS: llvm/lib/Reoptimizer/TraceCache/TraceCache.cpp MemoryManager.cpp

[Brian Gaeke]

Changes in directory llvm/lib/Reoptimizer/TraceCache:

TraceCache.cpp updated: 1.16 -> 1.17
MemoryManager.cpp updated: 1.9 -> 1.10

---
Log message:

No need to have the dummy function take parameters or return a value.

include/llvm/Reoptimizer/MemoryManager.h: Change type of dummy function used
 for trace cache.
lib/Reoptimizer/TraceCache/TraceCache.cpp: Likewise.
lib/Reoptimizer/TraceCache/MemoryManager.cpp: Likewise. Also change decl.
include/llvm/Reoptimizer/TraceCache.h: Likewise. Also remove commented-out
 forward decl of TraceCache2.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/TraceCache/TraceCache.cpp
diff -u llvm/lib/Reoptimizer/TraceCache/TraceCache.cpp:1.16 llvm/lib/Reoptimizer/TraceCache/TraceCache.cpp:1.17
--- llvm/lib/Reoptimizer/TraceCache/TraceCache.cpp:1.16	Fri Jul 25 12:33:21 2003
+++ llvm/lib/Reoptimizer/TraceCache/TraceCache.cpp	Wed Aug  6 16:45:44 2003
@@ -65,7 +65,7 @@
 }
 
 
-TraceCache::TraceCache(int (*dfunc)(int), unsigned int memSize, 
+TraceCache::TraceCache(void (*dfunc)(), unsigned int memSize, 
 		       VirtualMem *vmem){
   mm = new MemoryManager(dfunc, memSize);
 


Index: llvm/lib/Reoptimizer/TraceCache/MemoryManager.cpp
diff -u llvm/lib/Reoptimizer/TraceCache/MemoryManager.cpp:1.9 llvm/lib/Reoptimizer/TraceCache/MemoryManager.cpp:1.10
--- llvm/lib/Reoptimizer/TraceCache/MemoryManager.cpp:1.9	Fri Jul 25 12:33:21 2003
+++ llvm/lib/Reoptimizer/TraceCache/MemoryManager.cpp	Wed Aug  6 16:45:44 2003
@@ -29,7 +29,7 @@
 
 using std::cerr;
 
-int FirstTraceFunction(int i); //the function that provides memory!
+extern "C" void FirstTraceFunction (); //the function that provides memory!
 
 MemoryManager::MemoryManager(){
   uint64_t memAlign = (uint64_t)(intptr_t)&FirstTraceFunction;
@@ -63,7 +63,7 @@
   freeMemList.push_back(std::make_pair(memStart, memEnd));
 }
 
-MemoryManager::MemoryManager(int (*dfunc)(int), unsigned int memSize){
+MemoryManager::MemoryManager(void (*dfunc)(), unsigned int memSize){
   uint64_t memAlign = (uint64_t)(intptr_t)dfunc;
   if(memAlign % 32){
     memAlign -= (memAlign % 32);