Changeset 36969 in vbox

Timestamp:

May 5, 2011 8:59:43 AM (14 years ago)

Author:

vboxsync

Message:

more gcc-4.6 -Werror=int-to-pointer-cast fixes

Location:

trunk/src/VBox

Files:

• Runtime/common/ldr/ldrPE.cpp (modified) (1 diff)
• VMM/VMMR3/CSAM.cpp (modified) (1 diff)
• VMM/VMMR3/PATM.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

@@ -316 +316 @@
                                   ~0, &Value, pvUser);
                 Log4((RT_SUCCESS(rc) ? "RTLdrPE:  %RTptr %s\n" : "RTLdrPE:  %08RX32 %s rc=%Rrc\n",
-                      (uint32_t)Value, PE_RVA2TYPE(pvBitsR, (char*)pThunk->u1.AddressOfData + 2, const char *), rc));
+                      (uint32_t)Value, PE_RVA2TYPE(pvBitsR, (char*)(uintptr_t)pThunk->u1.AddressOfData + 2, const char *), rc));
             }
             else

trunk/src/VBox/VMM/VMMR3/CSAM.cpp

@@ -1984 +1984 @@
     PCSAMPAGEREC pPageRec;
 
-    pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)pPageAddrGC);
+    pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)(uintptr_t)pPageAddrGC);
     Assert(pPageRec && pPageRec->page.enmTag == enmTag);
 #endif

trunk/src/VBox/VMM/VMMR3/PATM.cpp

@@ -2013 +2013 @@
     pRec = (PAVLPVNODECORE)MMR3HeapAllocZ(pVM, MM_TAG_PATM_PATCH, sizeof(*pRec));
     Assert(pRec);
-    pRec->Key = (AVLPVKEY)pInstrGC;
+    pRec->Key = (AVLPVKEY)(uintptr_t)pInstrGC;
 
     int ret = RTAvlPVInsert(&pPatch->pTempInfo->DisasmJumpTree, pRec);
@@ -2031 +2031 @@
     PAVLPVNODECORE pRec;
 
-    pRec = RTAvlPVGet(&pPatch->pTempInfo->DisasmJumpTree, (AVLPVKEY)pInstrGC);
+    pRec = RTAvlPVGet(&pPatch->pTempInfo->DisasmJumpTree, (AVLPVKEY)(uintptr_t)pInstrGC);
     if (pRec)
         return true;