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

Timestamp:

Feb 24, 2022 4:02:00 PM (3 years ago)

Author:

vboxsync

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

150159

Message:

VMM,VMMDev,scm,VBox/param.h: Don't use PAGE_BASE_GC_MASK and friends in the VMM. bugref:9898

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAll.cpp (modified) (2 diffs)
• VMMAll/PGMAllGst.h (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (2 diffs)
• VMMAll/VMXAllTemplate.cpp.h (modified) (1 diff)
• VMMR0/HMSVMR0.cpp (modified) (2 diffs)
• VMMR3/CPUM.cpp (modified) (1 diff)
• VMMR3/DBGFDisas.cpp (modified) (1 diff)
• VMMR3/PGMPool.cpp (modified) (1 diff)

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

@@ -1137 +1137 @@
     Assert(!(fOpFlags & ~(PGM_MK_PG_IS_MMIO2 | PGM_MK_PG_IS_WRITE_FAULT)));
 
-    GCPtr &= PAGE_BASE_GC_MASK; /** @todo this ain't necessary, right... */
+    GCPtr &= ~(RTGCPTR)GUEST_PAGE_OFFSET_MASK; /** @todo this ain't necessary, right... */
 
     PVMCC pVM = pVCpu->CTX_SUFF(pVM);
@@ -2070 +2070 @@
     cb     += GCPtr & GUEST_PAGE_OFFSET_MASK;
     cb      = RT_ALIGN_Z(cb, GUEST_PAGE_SIZE);
-    GCPtr   = (GCPtr & PAGE_BASE_GC_MASK);
+    GCPtr  &= ~(RTGCPTR)GUEST_PAGE_OFFSET_MASK;
 
     /*

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

@@ -390 +390 @@
     pWalk->fSucceeded = true;
     pWalk->GCPtr      = GCPtr;
-    pWalk->GCPhys     = GCPtr & PAGE_BASE_GC_MASK;
+    pWalk->GCPhys     = GCPtr & ~(RTGCPHYS)GUEST_PAGE_OFFSET_MASK;
     pWalk->fEffective = X86_PTE_P | X86_PTE_RW | X86_PTE_US;
     NOREF(pVCpu);

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

@@ -1190 +1190 @@
 
             /* Temporarily allow write access to the page table again. */
-            rc = PGMHandlerPhysicalPageTempOff(pVM, pPage->GCPhys & PAGE_BASE_GC_MASK, pPage->GCPhys & PAGE_BASE_GC_MASK);
+            rc = PGMHandlerPhysicalPageTempOff(pVM,
+                                               pPage->GCPhys & ~(RTGCPHYS)GUEST_PAGE_OFFSET_MASK,
+                                               pPage->GCPhys & ~(RTGCPHYS)GUEST_PAGE_OFFSET_MASK);
             if (rc == VINF_SUCCESS)
             {
@@ -1641 +1643 @@
 
     /* First write protect the page again to catch all write accesses. (before checking for changes -> SMP) */
-    int rc = PGMHandlerPhysicalReset(pVM, pPage->GCPhys & PAGE_BASE_GC_MASK);
+    int rc = PGMHandlerPhysicalReset(pVM, pPage->GCPhys & ~(RTGCPHYS)GUEST_PAGE_OFFSET_MASK);
     Assert(rc == VINF_SUCCESS);
     pPage->fDirty = false;

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

@@ -8520 +8520 @@
 
             RTGCPHYS GCPhys = VCPU_2_VMXSTATE(pVCpu).vmx.u64GstMsrApicBase;    /* Always up-to-date, as it is not part of the VMCS. */
-            GCPhys &= PAGE_BASE_GC_MASK;
+            GCPhys &= ~(RTGCPHYS)GUEST_PAGE_OFFSET_MASK;
             GCPhys += VMX_EXIT_QUAL_APIC_ACCESS_OFFSET(pVmxTransient->uExitQual);
             Log4Func(("Linear access uAccessType=%#x GCPhys=%#RGp Off=%#x\n", uAccessType, GCPhys,

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -7926 +7926 @@
     {
         RTGCPHYS GCPhysApicBase = APICGetBaseMsrNoCheck(pVCpu);
-        GCPhysApicBase &= PAGE_BASE_GC_MASK;
+        GCPhysApicBase &= ~(RTGCPHYS)GUEST_PAGE_OFFSET_MASK;
 
         if (GCPhysFaultAddr == GCPhysApicBase + XAPIC_OFF_TPR)
@@ -8281 +8281 @@
         RTGCPHYS GCPhysApicBase;
         GCPhysApicBase  = APICGetBaseMsrNoCheck(pVCpu);
-        GCPhysApicBase &= PAGE_BASE_GC_MASK;
+        GCPhysApicBase &= ~(RTGCPHYS)GUEST_PAGE_OFFSET_MASK;
 
         /* Check if the page at the fault-address is the APIC base. */

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

@@ -4186 +4186 @@
         {
             /* translate the address */
-            pState->pvPageGC = GCPtr & PAGE_BASE_GC_MASK;
+            pState->pvPageGC = GCPtr & ~(RTGCPTR)GUEST_PAGE_OFFSET_MASK;
 
             /* Release mapping lock previously acquired. */

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

@@ -221 +221 @@
 
             /* translate the address */
-            pState->GCPtrPage = GCPtr & PAGE_BASE_GC_MASK;
+            pState->GCPtrPage = GCPtr & ~(RTGCPTR)GUEST_PAGE_OFFSET_MASK;
             if (pState->fLocked)
                 PGMPhysReleasePageMappingLock(pState->pVM, &pState->PageMapLock);

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

@@ -703 +703 @@
 
         /* First write protect the page again to catch all write accesses. (before checking for changes -> SMP) */
-        int rc = PGMHandlerPhysicalReset(pVM, pPage->GCPhys & PAGE_BASE_GC_MASK);
+        int rc = PGMHandlerPhysicalReset(pVM, pPage->GCPhys & ~(RTGCPHYS)GUEST_PAGE_OFFSET_MASK);
         AssertRCSuccess(rc);
         pPage->fDirty = false;