Changeset 105745 in vbox for trunk/src/VBox/VMM/VMMR3/DBGFMem.cpp

Timestamp:

Aug 21, 2024 7:16:50 AM (5 months ago)

Author:

vboxsync

Message:

VMM/PGM: Some preparations for ARMv8 page table walking, introduce dedicated PGMMODE enumerations for ARMv8 and hide all accesses behind PGMMODE_XXX macros, bugref:10388

File:

• trunk/src/VBox/VMM/VMMR3/DBGFMem.cpp (modified) (8 diffs)

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

@@ -80 +80 @@
     PVMCPU  pVCpu   = VMMGetCpuById(pVM, idCpu);
     PGMMODE enmMode = PGMGetGuestMode(pVCpu);
-    if (    enmMode == PGMMODE_REAL
-        ||  enmMode == PGMMODE_PROTECTED
+    if (    !PGMMODE_WITH_PAGING(enmMode)
         ||  DBGFADDRESS_IS_PHYS(pAddress)
         )
@@ -98 +97 @@
         if (    (   pAddress->FlatPtr >= _4G
                  || pAddress->FlatPtr + cbRange > _4G)
-            &&  enmMode != PGMMODE_AMD64
-            &&  enmMode != PGMMODE_AMD64_NX)
+            &&  !PGMMODE_IS_64BIT_MODE(enmMode))
             return VERR_DBGF_MEM_NOT_FOUND;
 #endif
@@ -174 +172 @@
     PVMCPU  pVCpu   = VMMGetCpuById(pVM, idCpu);
     PGMMODE enmMode = PGMGetGuestMode(pVCpu);
-    if (    enmMode == PGMMODE_REAL
-        ||  enmMode == PGMMODE_PROTECTED
-        ||  DBGFADDRESS_IS_PHYS(pAddress) )
+    if (    !PGMMODE_WITH_PAGING(enmMode)
+        ||  DBGFADDRESS_IS_PHYS(pAddress))
         rc = PGMPhysSimpleReadGCPhys(pVM, pvBuf, pAddress->FlatPtr, cbRead);
     else
@@ -183 +180 @@
         if (    (   pAddress->FlatPtr >= _4G
                  || pAddress->FlatPtr + cbRead > _4G)
-            &&  enmMode != PGMMODE_AMD64
-            &&  enmMode != PGMMODE_AMD64_NX)
+            &&  !PGMMODE_IS_64BIT_MODE(enmMode))
             return VERR_PAGE_TABLE_NOT_PRESENT;
 #endif
@@ -327 +323 @@
     PVMCPU  pVCpu   = VMMGetCpuById(pVM, idCpu);
     PGMMODE enmMode = PGMGetGuestMode(pVCpu);
-    if (    enmMode == PGMMODE_REAL
-        ||  enmMode == PGMMODE_PROTECTED
-        ||  DBGFADDRESS_IS_PHYS(pAddress) )
+    if (   !PGMMODE_WITH_PAGING(enmMode)
+        || DBGFADDRESS_IS_PHYS(pAddress))
         rc = PGMPhysSimpleWriteGCPhys(pVM, pAddress->FlatPtr, pvBuf, cbWrite);
     else
@@ -336 +331 @@
         if (    (   pAddress->FlatPtr >= _4G
                  || pAddress->FlatPtr + cbWrite > _4G)
-            &&  enmMode != PGMMODE_AMD64
-            &&  enmMode != PGMMODE_AMD64_NX)
+            &&  !PGMMODE_IS_64BIT_MODE(enmMode))
             return VERR_PAGE_TABLE_NOT_PRESENT;
 #endif
@@ -512 +506 @@
     switch (enmMode)
     {
+#if !defined(VBOX_VMM_TARGET_ARMV8)
         case PGMMODE_32_BIT:
             return DBGFPGDMP_FLAGS_PSE;
@@ -534 +529 @@
         default:
             AssertFailedReturn(UINT32_MAX);
+#else
+        case PGMMODE_NONE:
+            return 0;
+        default:
+            AssertFailedReturn(UINT32_MAX);
+#endif
     }
 }