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

Timestamp:

Dec 4, 2024 3:20:14 PM (6 weeks ago)

Author:

vboxsync

Message:

VMM: Cleaning up ARMv8 / x86 split. jiraref:VBP-1470

File:

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

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

@@ -359 +359 @@
 
 
-#if !defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_X86
 /**
  * Worker for DBGFR3SelQueryInfo that calls into SELM.
@@ -409 +409 @@
     return rc;
 }
-#endif
+#endif /* VBOX_VMM_TARGET_X86 */
 
 
@@ -447 +447 @@
     memset(pSelInfo, 0, sizeof(*pSelInfo));
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_X86
+    /*
+     * Dispatch the request to a worker running on the target CPU.
+     */
+    return VMR3ReqPriorityCallWaitU(pUVM, idCpu, (PFNRT)dbgfR3SelQueryInfo, 5, pUVM, idCpu, Sel, fFlags, pSelInfo);
+#else
     RT_NOREF(Sel);
     return VERR_NOT_SUPPORTED;
-#else
-    /*
-     * Dispatch the request to a worker running on the target CPU.
-     */
-    return VMR3ReqPriorityCallWaitU(pUVM, idCpu, (PFNRT)dbgfR3SelQueryInfo, 5, pUVM, idCpu, Sel, fFlags, pSelInfo);
 #endif
 }
@@ -496 +496 @@
 
 
+#ifdef VBOX_WITH_HWVIRT
 /**
  * Converts a PGM paging mode to a set of DBGFPGDMP_XXX flags.
@@ -506 +507 @@
     switch (enmMode)
     {
-#if !defined(VBOX_VMM_TARGET_ARMV8)
+# ifdef VBOX_VMM_TARGET_X86
         case PGMMODE_32_BIT:
             return DBGFPGDMP_FLAGS_PSE;
@@ -525 +526 @@
         case PGMMODE_EPT:
             return DBGFPGDMP_FLAGS_EPT;
+
+# elif defined(VBOX_VMM_TARGET_ARM64)
+       /** @todo arm64: dumping page tables. */
+# else
+#  error "port me"
+# endif
         case PGMMODE_NONE:
             return 0;
         default:
             AssertFailedReturn(UINT32_MAX);
-#else
-        case PGMMODE_NONE:
-            return 0;
-        default:
-            AssertFailedReturn(UINT32_MAX);
-#endif
-    }
-}
+    }
+}
+#endif /* VBOX_WITH_HWVIRT */
 
 
@@ -586 +588 @@
                 return VINF_SUCCESS;
             }
-
-#if !defined(VBOX_VMM_TARGET_ARMV8)
+#if defined(VBOX_WITH_HWVIRT)
             if (fFlags & DBGFPGDMP_FLAGS_CURRENT_CR3)
                 cr3 = PGMGetHyperCR3(pVCpu);
-#endif
             if (fFlags & DBGFPGDMP_FLAGS_CURRENT_MODE)
                 fFlags |= dbgfR3PagingDumpModeToFlags(PGMGetShadowMode(pVCpu));
+#else
+            pHlp->pfnPrintf(pHlp, "Expected shadowing mode PGMMODE_NONE, found %d!\n", PGMGetShadowMode(pVCpu));
+            return VINF_SUCCESS;
+#endif
         }
         else
         {
-#if defined(VBOX_VMM_TARGET_ARMV8)
-            AssertReleaseFailed();
-#else
+#ifdef VBOX_VMM_TARGET_X86
             if (fFlags & DBGFPGDMP_FLAGS_CURRENT_CR3)
                 cr3 = CPUMGetGuestCR3(pVCpu);
@@ -608 +610 @@
                 fFlags |= CPUMGetGuestEFER(pVCpu) & (MSR_K6_EFER_LME | MSR_K6_EFER_NXE);
             }
+#elif defined(VBOX_VMM_TARGET_ARMV8)
+            /** @todo arm64: port me   */
+            AssertReleaseFailed();
+            return VERR_NOT_IMPLEMENTED;
+#else
+# error "port me"
 #endif
         }
@@ -645 +653 @@
                                 uint64_t u64LastAddr, uint32_t cMaxDepth, PCDBGFINFOHLP pHlp)
 {
+/** @todo adjust this for ARMv8. Probably need two root parameters (instead of
+ * cr3) as well as a bunch new flags. */
     /*
      * Input validation.