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

[Anand Shukla]

Changes in directory llvm/lib/Reoptimizer/Trigger:

Trigger.cpp updated: 1.15 -> 1.16

---
Log message:

corrected for compilation warnings

---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/Trigger/Trigger.cpp
diff -u llvm/lib/Reoptimizer/Trigger/Trigger.cpp:1.15 llvm/lib/Reoptimizer/Trigger/Trigger.cpp:1.16
--- llvm/lib/Reoptimizer/Trigger/Trigger.cpp:1.15	Fri Feb 14 14:46:29 2003
+++ llvm/lib/Reoptimizer/Trigger/Trigger.cpp	Wed Feb 19 13:26:38 2003
@@ -271,8 +271,10 @@
                    && "Incorrect trace");
 
             //insert a BA going to the top
-            trace.push_back(getBranchInst(0x10800000, (uint64_t)(&trace[0]),
-                                          (uint64_t)(&trace[instIndex])));
+            trace.push_back(getBranchInst
+                            (0x10800000, 
+                             (uint64_t)(intptr_t)&trace[0],
+                             (uint64_t)(intptr_t)&trace[instIndex]));
             //insert delay slot
             if(addrToRm.find(addr+4) == addrToRm.end())
               trace.push_back(vm->readInstrFrmVm(addr+4, tr));
@@ -351,8 +353,10 @@
                    && "Incorrect trace");
             
             //insert a BA going to the top
-            trace.push_back(getBranchInst(0x10800000, (uint64_t)(&trace[0]),
-                                          (uint64_t)(&trace[instIndex])));
+            trace.push_back(getBranchInst
+                            (0x10800000, 
+                             (uint64_t)(intptr_t)&trace[0],
+                             (uint64_t)(intptr_t)&trace[instIndex]));
             
             
             
@@ -506,7 +510,9 @@
     instVec.push_back(jmpl);
     instVec.push_back(load1); //delay slot!
 
-    uint64_t newInst = getBranchInst(instr, (uint64_t)(&instVec[instIndex]), (uint64_t)(&instVec[MI->first]));
+    uint64_t newInst = getBranchInst(instr, 
+                                     (uint64_t)(intptr_t)&instVec[instIndex], 
+                                     (uint64_t)(intptr_t)&instVec[MI->first]);
     instVec[MI->first] = newInst;
 
     //change original call map to point to new PC