Changeset 93554 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

Timestamp:

Feb 2, 2022 10:57:02 PM (3 years ago)

Author:

vboxsync

Message:

VMM: Changed PAGE_SIZE -> GUEST_PAGE_SIZE / HOST_PAGE_SIZE, PAGE_SHIFT -> GUEST_PAGE_SHIFT / HOST_PAGE_SHIFT, and PAGE_OFFSET_MASK -> GUEST_PAGE_OFFSET_MASK / HOST_PAGE_OFFSET_MASK. Also removed most usage of ASMMemIsZeroPage and ASMMemZeroPage since the host and guest page size doesn't need to be the same any more. Some work left to do in the page pool code. bugref:9898

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (4 diffs)

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

@@ -336 +336 @@
         pWalk->fSucceeded = true;
         RTGCPHYS GCPhysPte = GST_GET_PTE_GCPHYS(Pte)
-                           | (GCPtr & PAGE_OFFSET_MASK);
+                           | (GCPtr & GUEST_PAGE_OFFSET_MASK);
 # ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
         PGM_GST_SLAT_WALK(pVCpu, GCPtr, GCPhysPte, GCPhysPte, pWalk);
@@ -406 +406 @@
     }
 
-    pWalk->GCPhys    &= ~(RTGCPHYS)PAGE_OFFSET_MASK;
+    pWalk->GCPhys    &= ~(RTGCPHYS)GUEST_PAGE_OFFSET_MASK;
     pWalk->fEffective = fFlags;
     return VINF_SUCCESS;
@@ -432 +432 @@
 PGM_GST_DECL(int, ModifyPage)(PVMCPUCC pVCpu, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask)
 {
-    Assert((cb & PAGE_OFFSET_MASK) == 0); RT_NOREF_PV(cb);
+    Assert((cb & GUEST_PAGE_OFFSET_MASK) == 0); RT_NOREF_PV(cb);
 
 #if PGM_GST_TYPE == PGM_TYPE_32BIT \
@@ -461 +461 @@
 
                 /* next page */
-                cb -= PAGE_SIZE;
+                cb -= GUEST_PAGE_SIZE;
                 if (!cb)
                     return VINF_SUCCESS;
-                GCPtr += PAGE_SIZE;
+                GCPtr += GUEST_PAGE_SIZE;
                 iPTE++;
             }