Changeset 91712 in vbox

Timestamp:

Oct 13, 2021 11:33:18 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM: Nested VMX: bugref:10092 Removed PGMMODEDATAGST::pfnGetPDE, no longer used.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAll.cpp (modified) (6 diffs)
• VMMAll/PGMAllGst.h (modified) (2 diffs)
• include/PGMInternal.h (modified) (1 diff)

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

@@ -562 +562 @@
 PGMMODEDATAGST const g_aPgmGuestModeData[PGM_GUEST_MODE_DATA_ARRAY_SIZE] =
 {
-    { UINT32_MAX, NULL, NULL, NULL, NULL, NULL }, /* 0 */
+    { UINT32_MAX, NULL, NULL, NULL, NULL }, /* 0 */
     {
         PGM_TYPE_REAL,
         PGM_GST_NAME_REAL(GetPage),
         PGM_GST_NAME_REAL(ModifyPage),
-        PGM_GST_NAME_REAL(GetPDE),
         PGM_GST_NAME_REAL(Enter),
         PGM_GST_NAME_REAL(Exit),
@@ -578 +577 @@
         PGM_GST_NAME_PROT(GetPage),
         PGM_GST_NAME_PROT(ModifyPage),
-        PGM_GST_NAME_PROT(GetPDE),
         PGM_GST_NAME_PROT(Enter),
         PGM_GST_NAME_PROT(Exit),
@@ -589 +587 @@
         PGM_GST_NAME_32BIT(GetPage),
         PGM_GST_NAME_32BIT(ModifyPage),
-        PGM_GST_NAME_32BIT(GetPDE),
         PGM_GST_NAME_32BIT(Enter),
         PGM_GST_NAME_32BIT(Exit),
@@ -600 +597 @@
         PGM_GST_NAME_PAE(GetPage),
         PGM_GST_NAME_PAE(ModifyPage),
-        PGM_GST_NAME_PAE(GetPDE),
         PGM_GST_NAME_PAE(Enter),
         PGM_GST_NAME_PAE(Exit),
@@ -612 +608 @@
         PGM_GST_NAME_AMD64(GetPage),
         PGM_GST_NAME_AMD64(ModifyPage),
-        PGM_GST_NAME_AMD64(GetPDE),
         PGM_GST_NAME_AMD64(Enter),
         PGM_GST_NAME_AMD64(Exit),
@@ -3211 +3206 @@
     AssertPtrReturn(g_aPgmGuestModeData[idxNewGst].pfnGetPage, VERR_PGM_MODE_IPE);
     AssertPtrReturn(g_aPgmGuestModeData[idxNewGst].pfnModifyPage, VERR_PGM_MODE_IPE);
-    AssertPtrReturn(g_aPgmGuestModeData[idxNewGst].pfnGetPDE, VERR_PGM_MODE_IPE);
     AssertPtrReturn(g_aPgmGuestModeData[idxNewGst].pfnExit, VERR_PGM_MODE_IPE);
     AssertPtrReturn(g_aPgmGuestModeData[idxNewGst].pfnEnter, VERR_PGM_MODE_IPE);

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

@@ -28 +28 @@
 PGM_GST_DECL(int,  GetPage)(PVMCPUCC pVCpu, RTGCPTR GCPtr, uint64_t *pfFlags, PRTGCPHYS pGCPhys);
 PGM_GST_DECL(int,  ModifyPage)(PVMCPUCC pVCpu, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask);
-PGM_GST_DECL(int,  GetPDE)(PVMCPUCC pVCpu, RTGCPTR GCPtr, PX86PDEPAE pPDE);
 
 #ifdef IN_RING3 /* r3 only for now.  */
@@ -456 +455 @@
 
 
-/**
- * Retrieve guest PDE information.
- *
- * @returns VBox status code.
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   GCPtr       Guest context pointer.
- * @param   pPDE        Pointer to guest PDE structure.
- */
-PGM_GST_DECL(int, GetPDE)(PVMCPUCC pVCpu, RTGCPTR GCPtr, PX86PDEPAE pPDE)
-{
-#if PGM_GST_TYPE == PGM_TYPE_32BIT \
- || PGM_GST_TYPE == PGM_TYPE_PAE   \
- || PGM_GST_TYPE == PGM_TYPE_AMD64
-
-# if PGM_GST_TYPE != PGM_TYPE_AMD64
-    /* Boundary check. */
-    if (RT_UNLIKELY(GCPtr >= _4G))
-        return VERR_PAGE_TABLE_NOT_PRESENT;
-# endif
-
-# if PGM_GST_TYPE == PGM_TYPE_32BIT
-    unsigned    iPd = (GCPtr >> GST_PD_SHIFT) & GST_PD_MASK;
-    PX86PD      pPd = pgmGstGet32bitPDPtr(pVCpu);
-
-# elif PGM_GST_TYPE == PGM_TYPE_PAE
-    unsigned    iPd = 0;                /* shut up gcc */
-    PCX86PDPAE  pPd = pgmGstGetPaePDPtr(pVCpu, GCPtr, &iPd, NULL);
-
-# elif PGM_GST_TYPE == PGM_TYPE_AMD64
-    PX86PML4E   pPml4eIgn;
-    X86PDPE     PdpeIgn;
-    unsigned    iPd = 0;                /* shut up gcc */
-    PCX86PDPAE  pPd = pgmGstGetLongModePDPtr(pVCpu, GCPtr, &pPml4eIgn, &PdpeIgn, &iPd);
-    /* Note! We do not return an effective PDE here like we do for the PTE in GetPage method. */
-# endif
-
-    if (RT_LIKELY(pPd))
-        pPDE->u = (X86PGPAEUINT)pPd->a[iPd].u;
-    else
-        pPDE->u = 0;
-    return VINF_SUCCESS;
-
-#else
-    NOREF(pVCpu); NOREF(GCPtr); NOREF(pPDE);
-    AssertFailed();
-    return VERR_NOT_IMPLEMENTED;
-#endif
-}
-
-
 #ifdef IN_RING3
 /**

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -2743 +2743 @@
     DECLCALLBACKMEMBER(int, pfnGetPage,(PVMCPUCC pVCpu, RTGCPTR GCPtr, uint64_t *pfFlags, PRTGCPHYS pGCPhys));
     DECLCALLBACKMEMBER(int, pfnModifyPage,(PVMCPUCC pVCpu, RTGCPTR GCPtr, size_t cbPages, uint64_t fFlags, uint64_t fMask));
-    DECLCALLBACKMEMBER(int, pfnGetPDE,(PVMCPUCC pVCpu, RTGCPTR GCPtr, PX86PDEPAE pPde));
     DECLCALLBACKMEMBER(int, pfnEnter,(PVMCPUCC pVCpu, RTGCPHYS GCPhysCR3));
     DECLCALLBACKMEMBER(int, pfnExit,(PVMCPUCC pVCpu));