Changeset 105427 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jul 22, 2024 1:12:50 PM (6 months ago)

Author:

vboxsync

Message:

VMM/IEM: More 'info dtlb/itlb' details. [build fix] bugref:10727

File:

• trunk/src/VBox/VMM/VMMR3/IEMR3.cpp (modified) (3 diffs)

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

@@ -1098 +1098 @@
     if (fFlags & IEMR3INFOTLB_F_CHECK)
     {
-        PGMPTWALKFAST WalkFast;
+        uint32_t const fInvSlotG = (uint32_t)!(uSlot & 1) << X86_PTE_BIT_Gx;
+        PGMPTWALKFAST  WalkFast;
         int rc = PGMGstQueryPageFast(pVCpu, GCPtr, 0 /*fFlags - don't check or modify anything */, &WalkFast);
         pszValid = szTmp;
@@ -1122 +1123 @@
                  == (  (pTlbe->fFlagsAndPhysRev & (  IEMTLBE_F_PT_NO_WRITE | IEMTLBE_F_PT_NO_USER
                                                    | IEMTLBE_F_PT_NO_DIRTY | IEMTLBE_F_PT_NO_ACCESSED))
-                     | (!(uSlot & 1) << X86_PTE_BIT_G) ) )
+                     | fInvSlotG ) )
             pszValid = " still-valid";
-        else if (   (~WalkFast.fEffective       & (X86_PTE_RW | X86_PTE_US | X86_PTE_G))
-                 == (  (pTlbe->fFlagsAndPhysRev & (IEMTLBE_F_PT_NO_WRITE | IEMTLBE_F_PT_NO_USER))
-                     | (!(uSlot & 1) << X86_PTE_BIT_G) ) )
+        else if (   (~WalkFast.fEffective     & (X86_PTE_RW | X86_PTE_US | X86_PTE_G))
+                 == ((pTlbe->fFlagsAndPhysRev & (IEMTLBE_F_PT_NO_WRITE | IEMTLBE_F_PT_NO_USER)) | fInvSlotG) )
             switch (  (~WalkFast.fEffective    & (X86_PTE_A | X86_PTE_D))
                     ^ (pTlbe->fFlagsAndPhysRev & (IEMTLBE_F_PT_NO_DIRTY | IEMTLBE_F_PT_NO_ACCESSED)) )
@@ -1151 +1151 @@
                         (~WalkFast.fEffective & X86_PTE_US) == (pTlbe->fFlagsAndPhysRev & IEMTLBE_F_PT_NO_USER) ? ""
                         : WalkFast.fEffective & X86_PTE_US ? " user-now"     : " user-no-more",
-                        (~WalkFast.fEffective & X86_PTE_G)  == (!(uSlot & 1) << X86_PTE_BIT_G) ? ""
+                        (~WalkFast.fEffective & X86_PTE_G)  == fInvSlotG ? ""
                         : WalkFast.fEffective & X86_PTE_G  ? " global-now"   : " global-no-more",
                         (~WalkFast.fEffective & X86_PTE_D)  == (pTlbe->fFlagsAndPhysRev & IEMTLBE_F_PT_NO_DIRTY) ? ""