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

[Chris Lattner]

Changes in directory llvm/lib/Reoptimizer/TraceCache:

MemoryManager.cpp updated: 1.1 -> 1.2
VirtualMem.cpp updated: 1.7 -> 1.8

---
Log message:

Fix warnings for anand


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/TraceCache/MemoryManager.cpp
diff -u llvm/lib/Reoptimizer/TraceCache/MemoryManager.cpp:1.1 llvm/lib/Reoptimizer/TraceCache/MemoryManager.cpp:1.2
--- llvm/lib/Reoptimizer/TraceCache/MemoryManager.cpp:1.1	Sun Sep 15 15:36:36 2002
+++ llvm/lib/Reoptimizer/TraceCache/MemoryManager.cpp	Mon Jan 27 17:41:43 2003
@@ -32,9 +32,9 @@
 int dummyFunction(int i); //the function that provides memory!
 
 MemoryManager::MemoryManager(){
-  memStart = (uint64_t)&dummyFunction;
-  memEnd = (uint64_t)&dummyFunction+globalMemSize*4;
-  std::cerr<<"Dummy address :"<<(void *)memStart<<"\n";
+  memStart = (intptr_t)&dummyFunction;
+  memEnd = (intptr_t)&dummyFunction+globalMemSize*4;
+  std::cerr<<"Dummy address :"<<(void *)(intptr_t)memStart<<"\n";
   freeMemList.push_back(std::make_pair(memStart, memEnd));
 }
 
@@ -49,11 +49,11 @@
   for(std::list<std::pair<uint64_t, uint64_t> >::iterator LI =
         freeMemList.begin(), LE = freeMemList.end(); LI!=LE; ++LI){
 
-    if(LI->second - LI->first >= sz-1){
+    if(int64_t(LI->second - LI->first) >= sz-1){
       uint64_t temp = LI->first;
 
       //reassign the pair
-      if(LI->second - LI->first == sz-1)
+      if(int64_t(LI->second - LI->first) == sz-1)
         freeMemList.erase(LI);
       else
         LI->first += sz;


Index: llvm/lib/Reoptimizer/TraceCache/VirtualMem.cpp
diff -u llvm/lib/Reoptimizer/TraceCache/VirtualMem.cpp:1.7 llvm/lib/Reoptimizer/TraceCache/VirtualMem.cpp:1.8
--- llvm/lib/Reoptimizer/TraceCache/VirtualMem.cpp:1.7	Mon Nov  4 18:50:24 2002
+++ llvm/lib/Reoptimizer/TraceCache/VirtualMem.cpp	Mon Jan 27 17:41:43 2003
@@ -102,7 +102,7 @@
 #ifdef GET_TRACE_TIME
 //write call instruction to llvm_start_time, followed by nop
 void VirtualMem::writeCallLLVMTime(uint64_t instAddr){
-  unsigned int callInst = getCallInstr((uint64_t)&llvm_time_start, instAddr);
+  unsigned int callInst = getCallInstr((uint64_t)(intptr_t)&llvm_time_start, instAddr);
   writeInstToVM(instAddr, callInst);
   writeInstToVM(instAddr+4, 0x01000000); 
 }