Changeset 26277 in vbox for trunk/src/VBox

Timestamp:

Feb 5, 2010 4:44:42 AM (15 years ago)

Author:

vboxsync

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

57336

Message:

VMM: more RC/GC warnings - CSAMDoesPageNeedScanning and CSAMMarkPage now takes RTRCUINTPTR instead of RTRCPTR to ease the pain using them in RC.

Location:

trunk/src/VBox/VMM

Files:

• PATM/VMMAll/CSAMAll.cpp (modified) (3 diffs)
• PGMInternal.h (modified) (3 diffs)
• VMMAll/PDMAllCritSect.cpp (modified) (1 diff)
• VMMAll/PGMAll.cpp (modified) (1 diff)
• VMMAll/PGMAllBth.h (modified) (9 diffs)

trunk/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp

@@ -109 +109 @@
  *
  */
-VMMDECL(int) CSAMMarkPage(PVM pVM, RTRCPTR pPage, bool fScanned)
+VMMDECL(int) CSAMMarkPage(PVM pVM, RTRCUINTPTR pPage, bool fScanned)
 {
     int pgdir, bit;
@@ -115 +115 @@
 
 #ifdef LOG_ENABLED
-    if (fScanned && !CSAMIsPageScanned(pVM, pPage))
+    if (fScanned && !CSAMIsPageScanned(pVM, (RTRCPTR)pPage))
        Log(("CSAMMarkPage %RRv\n", pPage));
 #endif
@@ -178 +178 @@
  * @param   GCPtr       GC pointer of page
  */
-VMMDECL(bool) CSAMDoesPageNeedScanning(PVM pVM, RTRCPTR GCPtr)
+VMMDECL(bool) CSAMDoesPageNeedScanning(PVM pVM, RTRCUINTPTR GCPtr)
 {
     if(!CSAMIsEnabled(pVM))
         return false;
 
-    if(CSAMIsPageScanned(pVM, GCPtr))
+    if(CSAMIsPageScanned(pVM, (RTRCPTR)GCPtr))
     {
         /* Already checked! */

trunk/src/VBox/VMM/PGMInternal.h

@@ -322 +322 @@
  */
 #ifdef IN_RC
-# define PGM_INVL_PG(pVCpu, GCVirt)             ASMInvalidatePage((void *)(GCVirt))
+# define PGM_INVL_PG(pVCpu, GCVirt)             ASMInvalidatePage((void *)(uintptr_t)(GCVirt))
 #elif defined(IN_RING0)
 # define PGM_INVL_PG(pVCpu, GCVirt)             HWACCMInvalidatePage(pVCpu, (RTGCPTR)(GCVirt))
@@ -336 +336 @@
  */
 #ifdef IN_RC
-# define PGM_INVL_PG_ALL_VCPU(pVM, GCVirt)      ASMInvalidatePage((void *)(GCVirt))
+# define PGM_INVL_PG_ALL_VCPU(pVM, GCVirt)      ASMInvalidatePage((void *)(uintptr_t)(GCVirt))
 #elif defined(IN_RING0)
 # define PGM_INVL_PG_ALL_VCPU(pVM, GCVirt)      HWACCMInvalidatePageOnAllVCpus(pVM, (RTGCPTR)(GCVirt))
@@ -906 +906 @@
  * @param   pPage       Pointer to the physical guest page tracking structure.
  */
-#define PGM_PAGE_GET_HNDL_VIRT_STATE(pPage) ( (pPage)->u16MiscY.au8[1] & UINT8_C(0x03) )
+#define PGM_PAGE_GET_HNDL_VIRT_STATE(pPage) ((uint8_t)( (pPage)->u16MiscY.au8[1] & UINT8_C(0x03) ))
 
 /**

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

@@ -71 +71 @@
 #else
     AssertMsgReturn(pCritSect->s.Core.u32Magic == RTCRITSECT_MAGIC, ("%RX32\n", pCritSect->s.Core.u32Magic),
-                    VERR_SEM_DESTROYED);
+                    NIL_RTNATIVETHREAD);
     PVM             pVM         = pCritSect->s.CTX_SUFF(pVM); AssertPtr(pVM);
     PVMCPU          pVCpu       = VMMGetCpu(pVM);             AssertPtr(pVCpu);

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

@@ -2218 +2218 @@
     PGMDynMapHCPage(pVM, HCPhys, ppv);
 #endif
-    *ppv = (void *)((uintptr_t)*ppv | (GCPhys & PAGE_OFFSET_MASK));
+    *ppv = (void *)((uintptr_t)*ppv | (uintptr_t)(GCPhys & PAGE_OFFSET_MASK));
     return VINF_SUCCESS;
 }

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -701 +701 @@
                 PGMGstGetPage(pVCpu, pvFault, &fPageGst2, &GCPhys2);
                 Log(("Page out of sync: %RGv eip=%08x PdeSrc.n.u1User=%d fPageGst2=%08llx GCPhys2=%RGp scan=%d\n",
-                     pvFault, pRegFrame->eip, PdeSrc.n.u1User, fPageGst2, GCPhys2, CSAMDoesPageNeedScanning(pVM, (RTRCPTR)pRegFrame->eip)));
+                     pvFault, pRegFrame->eip, PdeSrc.n.u1User, fPageGst2, GCPhys2, CSAMDoesPageNeedScanning(pVM, pRegFrame->eip)));
 #   endif /* LOG_ENABLED */
 
@@ -717 +717 @@
 #    ifdef CSAM_DETECT_NEW_CODE_PAGES
                             ||  (   !PATMIsPatchGCAddr(pVM, pRegFrame->eip)
-                                 && CSAMDoesPageNeedScanning(pVM, (RTRCPTR)pRegFrame->eip))   /* any new code we encounter here */
+                                 && CSAMDoesPageNeedScanning(pVM, pRegFrame->eip))   /* any new code we encounter here */
 #    endif /* CSAM_DETECT_NEW_CODE_PAGES */
                            )
@@ -776 +776 @@
                         /** @todo not correct for pages that contain both code and data!! */
                         Log2(("CSAMMarkPage %RGv; scanned=%d\n", pvFault, true));
-                        CSAMMarkPage(pVM, (RTRCPTR)pvFault, true);
+                        CSAMMarkPage(pVM, pvFault, true);
                     }
                 }
@@ -1728 +1728 @@
                                 if (    ((PdeSrc.u & PteSrc.u) & (X86_PTE_RW | X86_PTE_US))
                                     ||  iPTDst == ((GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK)   /* always sync GCPtrPage */
-                                    ||  !CSAMDoesPageNeedScanning(pVM, (RTRCPTR)GCPtrCurPage)
+                                    ||  !CSAMDoesPageNeedScanning(pVM, GCPtrCurPage)
                                     ||  (   (pPage = pgmPhysGetPage(&pVM->pgm.s, PteSrc.u & GST_PTE_PG_MASK))
                                          && PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
@@ -2688 +2688 @@
                         PPGMPAGE pPage;
                         if (    ((PdeSrc.u & pPTSrc->a[iPTSrc].u) & (X86_PTE_RW | X86_PTE_US))
-                            ||  !CSAMDoesPageNeedScanning(pVM, (RTRCPTR)((iPDSrc << GST_PD_SHIFT) | (iPTSrc << PAGE_SHIFT)))
+                            ||  !CSAMDoesPageNeedScanning(pVM, (iPDSrc << GST_PD_SHIFT) | (iPTSrc << PAGE_SHIFT))
                             ||  (   (pPage = pgmPhysGetPage(&pVM->pgm.s, PteSrc.u & GST_PTE_PG_MASK))
                                  &&  PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
@@ -2809 +2809 @@
                          */
                         else if (    !PdeSrc.n.u1User
-                                 &&  CSAMDoesPageNeedScanning(pVM, (RTRCPTR)(GCPtr | (iPTDst << SHW_PT_SHIFT))))
+                                 &&  CSAMDoesPageNeedScanning(pVM, GCPtr | (iPTDst << SHW_PT_SHIFT)))
                             PteDst.u = 0;
 # endif
@@ -3148 +3148 @@
         /** @todo not correct for pages that contain both code and data!! */
         Log(("CSAMMarkPage %RGv; scanned=%d\n", GCPtrPage, true));
-        CSAMMarkPage(pVM, (RTRCPTR)GCPtrPage, true);
+        CSAMMarkPage(pVM, GCPtrPage, true);
     }
 # endif
@@ -4239 +4239 @@
             pVCpu->pgm.s.pGstPaePdptR0 = (R0PTRTYPE(PX86PDPT))HCPtrGuestCR3;
 #  endif
-            pVCpu->pgm.s.pGstPaePdptRC = (RCPTRTYPE(PX86PDPT))((RCPTRTYPE(uint8_t *))pVM->pgm.s.GCPtrCR3Mapping + off);
+            pVCpu->pgm.s.pGstPaePdptRC = (RCPTRTYPE(PX86PDPT))((RTRCUINTPTR)pVM->pgm.s.GCPtrCR3Mapping + off);
             Log(("Cached mapping %RRv\n", pVCpu->pgm.s.pGstPaePdptRC));
 
@@ -4274 +4274 @@
                         pVCpu->pgm.s.apGstPaePDsR0[i]     = (R0PTRTYPE(PX86PDPAE))HCPtr;
 #  endif
-                        pVCpu->pgm.s.apGstPaePDsRC[i]     = (RCPTRTYPE(PX86PDPAE))GCPtr;
+                        pVCpu->pgm.s.apGstPaePDsRC[i]     = (RCPTRTYPE(PX86PDPAE))(RTRCUINTPTR)GCPtr;
                         pVCpu->pgm.s.aGCPhysGstPaePDs[i]  = GCPhys;
 #  ifdef IN_RC