Changeset 86458 in vbox for trunk

Timestamp:

Oct 6, 2020 3:09:55 PM (4 years ago)

Author:

vboxsync

Message:

VMM/pgmR0BthEPT*SyncPT: Don't use the bit fields as gcc may sometimes get them wrong (10), use new EPT_E_XXX constants instead. bugref:9841 bugref:9746

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (2 diffs)

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

@@ -3039 +3039 @@
             if (HCPhys != NIL_RTHCPHYS)
             {
+#  if PGM_SHW_TYPE == PGM_TYPE_EPT
+                PdeDst.u = HCPhys | EPT_E_READ | EPT_E_WRITE | EPT_E_EXECUTE | EPT_E_LEAF | EPT_E_IGNORE_PAT | EPT_E_TYPE_WB
+                         | (PdeDst.u & X86_PDE_AVL_MASK) /** @todo do we need this? */;
+#  else
                 PdeDst.u &= X86_PDE_AVL_MASK;
                 PdeDst.n.u1Present   = 1;
                 PdeDst.n.u1Write     = 1;
                 PdeDst.b.u1Size      = 1;
-#  if  PGM_SHW_TYPE == PGM_TYPE_EPT
-                PdeDst.n.u1Execute   = 1;
-                PdeDst.b.u1IgnorePAT = 1;
-                PdeDst.b.u3EMT       = VMX_EPT_MEMTYPE_WB;
-#  else
                 PdeDst.n.u1User      = 1;
-#  endif
                 PdeDst.u |= HCPhys; /* Note! Must be done last of gcc v10.2.1 20200723 (Red Hat 10.2.1-1) may drop the top 32 bits. */
+#  endif
                 SHW_PDE_ATOMIC_SET2(*pPdeDst, PdeDst);
 
@@ -3112 +3111 @@
 
     /* Save the new PDE. */
+# if PGM_SHW_TYPE == PGM_TYPE_EPT
+    PdeDst.u = pShwPage->Core.Key | EPT_E_READ | EPT_E_WRITE | EPT_E_EXECUTE
+             | (PdeDst.u & X86_PDE_AVL_MASK /** @todo do we really need this? */);
+# else
     PdeDst.u &= X86_PDE_AVL_MASK;
     PdeDst.n.u1Present  = 1;
     PdeDst.n.u1Write    = 1;
-# if PGM_SHW_TYPE == PGM_TYPE_EPT
-    PdeDst.n.u1Execute  = 1;
-# else
     PdeDst.n.u1User     = 1;
     PdeDst.n.u1Accessed = 1;
-# endif
     PdeDst.u |= pShwPage->Core.Key; /* Note! Must be done last of gcc v10.2.1 20200723 (Red Hat 10.2.1-1) drops the top 32 bits. */
     /** @todo r=bird: Stop using bitfields.  But we need to defined/find the EPT flags then. */
+# endif
     SHW_PDE_ATOMIC_SET2(*pPdeDst, PdeDst);