Changeset 26272 in vbox

Timestamp:

Feb 5, 2010 4:18:52 AM (15 years ago)

Author:

vboxsync

Message:

VMM: more RC/GC warnings.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (7 diffs)
• IOMAllMMIO.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -155 +155 @@
     if (!PATMIsPatchGCAddr(pVM, pSrc))
     {
-        int rc = MMGCRamRead(pVM, pDest, (void *)pSrc, cb);
+        int rc = MMGCRamRead(pVM, pDest, (void *)(uintptr_t)pSrc, cb);
         if (rc == VERR_ACCESS_DENIED)
         {
@@ -164 +164 @@
     }
     else /* the hypervisor region is always present. */
-        memcpy(pDest, (RTRCPTR)pSrc, cb);
+        memcpy(pDest, (RTRCPTR)(uintptr_t)pSrc, cb);
 
 # endif /* IN_RING3 */
@@ -412 +412 @@
 {
 #ifdef IN_RC
-    int rc = MMGCRamRead(pVM, pvDst, (void *)GCPtrSrc, cb);
+    int rc = MMGCRamRead(pVM, pvDst, (void *)(uintptr_t)GCPtrSrc, cb);
     if (RT_LIKELY(rc != VERR_ACCESS_DENIED))
         return rc;
@@ -937 +937 @@
     GCPtrPar1 = emConvertToFlatAddr(pVM, pRegFrame, pDis, &pDis->param1, GCPtrPar1);
 #ifdef IN_RC
-    pvParam1  = (void *)GCPtrPar1;
+    pvParam1  = (void *)(uintptr_t)GCPtrPar1;
 #else
     PGMPAGEMAPLOCK Lock;
@@ -1670 +1670 @@
             {
             case PARMTYPE_ADDRESS:
-                pParam1 = (RTRCPTR)param1.val.val64;
-                pParam1 = (RTRCPTR)emConvertToFlatAddr(pVM, pRegFrame, pDis, &pDis->param1, (RTGCPTR)(RTRCUINTPTR)pParam1);
+                pParam1 = (RTRCPTR)(uintptr_t)emConvertToFlatAddr(pVM, pRegFrame, pDis, &pDis->param1, (RTRCUINTPTR)param1.val.val64);
                 EM_ASSERT_FAULT_RETURN(pParam1 == (RTRCPTR)pvFault, VERR_EM_INTERPRETER);
                 break;
@@ -1742 +1741 @@
             {
             case PARMTYPE_ADDRESS:
-                pParam1 = (RTRCPTR)param1.val.val64;
-                pParam1 = (RTRCPTR)emConvertToFlatAddr(pVM, pRegFrame, pDis, &pDis->param1, (RTGCPTR)(RTRCUINTPTR)pParam1);
+                pParam1 = (RTRCPTR)(uintptr_t)emConvertToFlatAddr(pVM, pRegFrame, pDis, &pDis->param1, (RTRCUINTPTR)param1.val.val64);
                 EM_ASSERT_FAULT_RETURN(pParam1 == (RTRCPTR)pvFault, VERR_EM_INTERPRETER);
                 break;
@@ -1813 +1811 @@
             {
             case PARMTYPE_ADDRESS:
-                pParam1 = (RTRCPTR)param1.val.val64;
-                pParam1 = (RTRCPTR)emConvertToFlatAddr(pVM, pRegFrame, pDis, &pDis->param1, (RTGCPTR)(RTRCUINTPTR)pParam1);
+                pParam1 = (RTRCPTR)(uintptr_t)emConvertToFlatAddr(pVM, pRegFrame, pDis, &pDis->param1, (RTRCUINTPTR)param1.val.val64);
                 EM_ASSERT_FAULT_RETURN(pParam1 == (RTRCPTR)pvFault, VERR_EM_INTERPRETER);
                 break;

trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

@@ -275 +275 @@
              isn't a problem though since the operation can be restarted in REM. */
 #ifdef IN_RC
-    return MMGCRamReadNoTrapHandler(pDest, (void *)GCSrc, cb);
+    return MMGCRamReadNoTrapHandler(pDest, (void *)(uintptr_t)GCSrc, cb);
 #else
     return PGMPhysReadGCPtr(pVCpu, pDest, GCSrc, cb);
@@ -296 +296 @@
 #ifdef IN_RC
     NOREF(pCtxCore);
-    return MMGCRamWriteNoTrapHandler((void *)GCPtrDst, pvSrc, cb);
+    return MMGCRamWriteNoTrapHandler((void *)(uintptr_t)GCPtrDst, pvSrc, cb);
 #elif IN_RING0
     return PGMPhysInterpretedWriteNoHandlers(pVCpu, pCtxCore, GCPtrDst, pvSrc, cb, false /*fRaiseTrap*/);