Changeset 93554 in vbox for trunk/src/VBox/VMM/VMMR3/CPUM.cpp

Timestamp:

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

Author:

vboxsync

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

149688

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/VMMR3/CPUM.cpp (modified) (3 diffs)

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

@@ -4175 +4175 @@
          */
         if (   !pState->pvPageR3
-            || (GCPtr >> PAGE_SHIFT) != (pState->pvPageGC >> PAGE_SHIFT))
+            || (GCPtr >> GUEST_PAGE_SHIFT) != (pState->pvPageGC >> GUEST_PAGE_SHIFT))
         {
             /* translate the address */
@@ -4203 +4203 @@
          * Calc how much we can read.
          */
-        uint32_t cb = PAGE_SIZE - (GCPtr & PAGE_OFFSET_MASK);
+        uint32_t cb = GUEST_PAGE_SIZE - (GCPtr & GUEST_PAGE_OFFSET_MASK);
         if (!pState->f64Bits)
         {
@@ -4216 +4216 @@
          * Read and advance or exit.
          */
-        memcpy(&pDis->abInstr[offInstr], (uint8_t *)pState->pvPageR3 + (GCPtr & PAGE_OFFSET_MASK), cb);
+        memcpy(&pDis->abInstr[offInstr], (uint8_t *)pState->pvPageR3 + (GCPtr & GUEST_PAGE_OFFSET_MASK), cb);
         offInstr  += (uint8_t)cb;
         if (cb >= cbMinRead)