Changeset 36912 in vbox for trunk/src/VBox/VMM

Timestamp:

May 2, 2011 2:23:01 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71494

Message:

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

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CSAM.cpp (modified) (10 diffs)
• HWACCM.cpp (modified) (3 diffs)
• PATM.cpp (modified) (2 diffs)
• SSM.cpp (modified) (3 diffs)

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

@@ -779 +779 @@
     (pCpu)->apvUserData[0] = pVM;
     (pCpu)->apvUserData[1] = InstrHC;
-    (pCpu)->apvUserData[2] = (void *)InstrGC; Assert(sizeof(InstrGC) <= sizeof(pCpu->apvUserData[0]));
+    (pCpu)->apvUserData[2] = (void *)(uintptr_t)InstrGC; Assert(sizeof(InstrGC) <= sizeof(pCpu->apvUserData[0]));
 #ifdef DEBUG
     return DISInstrEx(pCpu, InstrGC, 0, pOpsize, pszOutput, OPTYPE_ALL);
@@ -1602 +1602 @@
         AssertMsgFailed(("PGMR3GetPage %RRv failed with %Rrc\n", addr, rc));
 
-    pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)addr);
+    pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)(uintptr_t)addr);
     if (pPageRec)
     {
@@ -1681 +1681 @@
     addr = addr & PAGE_BASE_GC_MASK;
 
-    pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)addr);
+    pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)(uintptr_t)addr);
     if (pPageRec)
     {
@@ -1706 +1706 @@
     pInstrGC = pInstrGC & PAGE_BASE_GC_MASK;
 
-    pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)pInstrGC);
+    pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)(uintptr_t)pInstrGC);
     if (pPageRec)
     {
@@ -1764 +1764 @@
     /* Round down to page boundary. */
     GCPtr = (GCPtr & PAGE_BASE_GC_MASK);
-    pPage->Core.Key                  = (AVLPVKEY)GCPtr;
+    pPage->Core.Key                  = (AVLPVKEY)(uintptr_t)GCPtr;
     pPage->page.pPageGC              = GCPtr;
     pPage->page.fCode32              = fCode32;
@@ -1870 +1870 @@
     fMonitorInvalidation = (enmTag == CSAM_TAG_PATM);
 
-    pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)pPageAddrGC);
+    pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)(uintptr_t)pPageAddrGC);
     if (pPageRec == NULL)
     {
@@ -1887 +1887 @@
         csamCreatePageRecord(pVM, pPageAddrGC, enmTag, true /* 32 bits code */, fMonitorInvalidation);
 
-        pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)pPageAddrGC);
+        pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)(uintptr_t)pPageAddrGC);
         Assert(pPageRec);
     }
@@ -2004 +2004 @@
 
     Log(("csamRemovePageRecord %RRv\n", GCPtr));
-    pPageRec = (PCSAMPAGEREC)RTAvlPVRemove(&pVM->csam.s.pPageTree, (AVLPVKEY)GCPtr);
+    pPageRec = (PCSAMPAGEREC)RTAvlPVRemove(&pVM->csam.s.pPageTree, (AVLPVKEY)(uintptr_t)GCPtr);
 
     if (pPageRec)
@@ -2164 +2164 @@
     }
 
-    pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)pInstr);
+    pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)(uintptr_t)pInstr);
     if (pPageRec)
     {
@@ -2347 +2347 @@
         Log(("CSAMR3FlushDirtyPages: flush %RRv (modifypage rc=%Rrc)\n", pVM->csam.s.pvDirtyBasePage[i], rc));
 
-        pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)GCPtr);
+        pPageRec = (PCSAMPAGEREC)RTAvlPVGet(&pVM->csam.s.pPageTree, (AVLPVKEY)(uintptr_t)GCPtr);
         if (pPageRec && pPageRec->page.enmTag == CSAM_TAG_REM)
         {

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

@@ -1729 +1729 @@
 int hwaccmR3EnablePatching(PVM pVM, VMCPUID idCpu, RTRCPTR pPatchMem, unsigned cbPatchMem)
 {
-    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONE_BY_ONE, hwaccmR3RemovePatches, (void *)idCpu);
+    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONE_BY_ONE, hwaccmR3RemovePatches, (void *)(uintptr_t)idCpu);
     AssertRC(rc);
 
@@ -1776 +1776 @@
 
     /* @todo Potential deadlock when other VCPUs are waiting on the IOM lock (we own it)!! */
-    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONE_BY_ONE, hwaccmR3RemovePatches, (void *)VMMGetCpuId(pVM));
+    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONE_BY_ONE, hwaccmR3RemovePatches, (void *)(uintptr_t)VMMGetCpuId(pVM));
     AssertRC(rc);
 
@@ -2197 +2197 @@
 VMMR3DECL(int) HWACCMR3PatchTprInstr(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
 {
-    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONE_BY_ONE, (pVM->hwaccm.s.pGuestPatchMem) ? hwaccmR3PatchTprInstr : hwaccmR3ReplaceTprInstr, (void *)pVCpu->idCpu);
+    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONE_BY_ONE, (pVM->hwaccm.s.pGuestPatchMem) ? hwaccmR3PatchTprInstr : hwaccmR3ReplaceTprInstr, (void *)(uintptr_t)pVCpu->idCpu);
     AssertRC(rc);
     return rc;

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

@@ -1129 +1129 @@
     pRec = (PAVLPVNODECORE)MMR3HeapAllocZ(pVM, MM_TAG_PATM_PATCH, sizeof(*pRec));
     Assert(pRec);
-    pRec->Key = (AVLPVKEY)pInstrGC;
+    pRec->Key = (AVLPVKEY)(uintptr_t)pInstrGC;
 
     bool ret = RTAvlPVInsert(&pPatch->pTempInfo->IllegalInstrTree, pRec);
@@ -1140 +1140 @@
     PAVLPVNODECORE pRec;
 
-    pRec = RTAvlPVGet(&pPatch->pTempInfo->IllegalInstrTree, (AVLPVKEY)pInstrGC);
+    pRec = RTAvlPVGet(&pPatch->pTempInfo->IllegalInstrTree, (AVLPVKEY)(uintptr_t)pInstrGC);
     if (pRec)
         return true;

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

@@ -6302 +6302 @@
             rc = ssmR3DataRead(pSSM, &u, sizeof(u));
             if (RT_SUCCESS(rc))
-                *ppv = (void *)(u ? 1 : 0);
+                *ppv = (void *)(u ? 1UL : 0UL);
         }
         else
@@ -6309 +6309 @@
             rc = ssmR3DataRead(pSSM, &u, sizeof(u));
             if (RT_SUCCESS(rc))
-                *ppv = (void *)(u ? 1 : 0);
+                *ppv = (void *)(u ? 1UL : 0UL);
         }
     }
@@ -6317 +6317 @@
         rc = SSMR3GetBool(pSSM, &f);
         if (RT_SUCCESS(rc))
-            *ppv = (void *)(f ? 1 : 0);
+            *ppv = (void *)(f ? 1UL : 0UL);
     }
     return rc;