Changeset 13203

Timestamp:

10/13/08 12:02:04 (3 months ago)

Author:

vboxsync

Message:

Missing shadow cases for EPT.

Files:

• trunk/include/VBox/hwacc_vmx.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllShw.h (modified) (8 diffs)

trunk/include/VBox/hwacc_vmx.h

@@ -235 +235 @@
-    uint64_t    u1IgnorePAT     : 1;
-    /** Big page (must be 1 here). */
-Big 
+Size
-    /** Available for software. */
-    uint64_t    u4Available     : 4;

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

@@ -1437 +1437 @@
-                    PteDst.n.u1IgnorePAT = 1;
-                    PteDst.n.u3EMT       = VMX_EPT_MEMTYPE_WB;
-Big
+Size
-#else
-                    PteDst.u = (PteSrc.u & ~(X86_PTE_PAE_PG_MASK | X86_PTE_AVL_MASK | X86_PTE_PAT | X86_PTE_PCD | X86_PTE_PWT | X86_PTE_RW))
@@ -1486 +1486 @@
-                    PteDst.n.u1IgnorePAT = 1;
-                    PteDst.n.u3EMT       = VMX_EPT_MEMTYPE_WB;
-Big
+Size
-#else
-                    PteDst.u = (PteSrc.u & ~(X86_PTE_PAE_PG_MASK | X86_PTE_AVL_MASK | X86_PTE_PAT | X86_PTE_PCD | X86_PTE_PWT))

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

@@ -135 +135 @@
-PGM_SHW_DECL(int, GetPage)(PVM pVM, RTGCUINTPTR GCPtr, uint64_t *pfFlags, PRTHCPHYS pHCPhys)
-{
- || PGM_SHW_TYPE == PGM_TYPE_EPT
+
-    return VERR_PAGE_TABLE_NOT_PRESENT;
-
@@ -181 +181 @@
-    const unsigned iPd = (GCPtr >> X86_PD_PAE_SHIFT) & X86_PD_PAE_MASK;
-    X86PDEPAE      Pde = CTXMID(pVM->pgm.s.ap,PaePDs)[iPDPT]->a[iPd];
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-# else /* PGM_TYPE_32BIT */
-    const unsigned iPd = (GCPtr >> X86_PD_SHIFT) & X86_PD_MASK;
@@ -203 +215 @@
-    else /* mapping: */
-    {
-
+
+
-        AssertFailed(); /* can't happen */
-# else
@@ -242 +255 @@
-
-    return VINF_SUCCESS;
-&& PGM_SHW_TYPE != PGM_TYPE_EPT 
+
-}
-
@@ -262 +275 @@
-PGM_SHW_DECL(int, ModifyPage)(PVM pVM, RTGCUINTPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask)
-{
- || PGM_SHW_TYPE == PGM_TYPE_EPT
+
-    return VERR_PAGE_TABLE_NOT_PRESENT;
-
@@ -307 +320 @@
-        X86PDEPAE Pde = CTXMID(pVM->pgm.s.ap,PaePDs)[iPDPT]->a[iPd];
-
+# elif PGM_SHW_TYPE == PGM_TYPE_EPT
+        const unsigned  iPd = ((GCPtr >> SHW_PD_SHIFT) & SHW_PD_MASK);
+        PEPTPD          pPDDst;
+        EPTPDE          Pde;
+
+        rc = PGMShwGetEPTPDPtr(pVM, GCPtr, NULL, &pPDDst);
+        if (rc != VINF_SUCCESS)
+        {
+            AssertRC(rc);
+            return rc;
+        }
+        Assert(pPDDst);
+        Pde = pPDDst->a[iPd];
-# else /* PGM_TYPE_32BIT */
-        const unsigned iPd = (GCPtr >> X86_PD_SHIFT) & X86_PD_MASK;
@@ -329 +355 @@
-                pPT->a[iPTE].u = (pPT->a[iPTE].u & (fMask | SHW_PTE_PG_MASK)) | (fFlags & ~SHW_PTE_PG_MASK);
-                Assert(pPT->a[iPTE].n.u1Present);
+# if PGM_SHW_TYPE == PGM_TYPE_EPT
+                HWACCMInvalidatePhysPage(pVM, (RTGCPHYS)GCPtr);
+# else
-                PGM_INVL_PG(GCPtr);
+# endif
-            }
-
@@ -340 +370 @@
-        }
-    }
-&& PGM_SHW_TYPE != PGM_TYPE_EPT 
+
-}
-