Changeset 92286 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

Timestamp:

Nov 9, 2021 11:48:32 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PGMAll.cpp: @todos bugref:10142

File:

• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (2 diffs)

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

@@ -1460 +1460 @@
         else if (CPUMGetGuestCR4(pVCpu) & X86_CR4_PAE)
         {
-            if (!(uGstPdpe & X86_PDPE_P))
+            if (uGstPdpe & X86_PDPE_P)
+            {
+                GCPdPt  = uGstPdpe & X86_PDPE_PG_MASK;
+                enmKind = PGMPOOLKIND_PAE_PD_FOR_PAE_PD;
+            }
+            else
             {
                 /* PD not present; guest must reload CR3 to change it.
                  * No need to monitor anything in this case. */
+                /** @todo r=bird: WTF is hit?!?   */
                 Assert(VM_IS_RAW_MODE_ENABLED(pVM));
                 GCPdPt  = uGstPdpe & X86_PDPE_PG_MASK;
                 enmKind = PGMPOOLKIND_PAE_PD_PHYS;
                 Assert(uGstPdpe & X86_PDPE_P); /* caller should do this already */
-            }
-            else
-            {
-                GCPdPt  = uGstPdpe & X86_PDPE_PG_MASK;
-                enmKind = PGMPOOLKIND_PAE_PD_FOR_PAE_PD;
             }
         }
@@ -1588 +1589 @@
             {
                 /* AMD-V nested paging or real/protected mode without paging */
-                GCPml4  = (RTGCPTR64)iPml4 << X86_PML4_SHIFT;
+                GCPml4  = (RTGCPTR64)iPml4 << X86_PML4_SHIFT; /** @todo bogus calculation for PML5 */
                 enmKind = PGMPOOLKIND_64BIT_PDPT_FOR_PHYS;
             }