Changeset 12937 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 2, 2008 1:31:24 PM (16 years ago)

Author:

vboxsync

Message:

SyncPageWorker updates for EPT.

File:

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

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

@@ -1396 +1396 @@
     if (PteSrc.n.u1Present)
     {
-#if PGM_SHW_TYPE == PGM_TYPE_EPT
-        AssertFailed();
-#endif
         /*
          * Find the ram range.
@@ -1416 +1413 @@
                 /** @todo r=bird: Are we actually handling dirty and access bits for pages with access handlers correctly? No. */
                 if (!PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage))
+                {
+#if PGM_SHW_TYPE == PGM_TYPE_EPT
+                    PteDst.u           = (HCPhys & EPT_PTE_PG_MASK);
+                    PteDst.n.u1Present = 1;
+                    PteDst.n.u1Execute = 1;
+                    /* PteDst.n.u1Write = 0 */
+#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))
                              | (HCPhys & X86_PTE_PAE_PG_MASK);
+#endif
+                }
                 else
                 {
@@ -1427 +1433 @@
             else
             {
+#if PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE)
                 /*
                  * If the page or page directory entry is not marked accessed,
@@ -1450 +1457 @@
                 }
                 else
+#endif
                 {
                     STAM_COUNTER_INC(&pVM->pgm.s.CTXMID(Stat,DirtyPageSkipped));
+#if PGM_SHW_TYPE == PGM_TYPE_EPT
+                    PteDst.u           = (HCPhys & EPT_PTE_PG_MASK);
+                    PteDst.n.u1Present = 1;
+                    PteDst.n.u1Write   = 1;
+                    PteDst.n.u1Execute = 1;
+#else
                     PteDst.u = (PteSrc.u & ~(X86_PTE_PAE_PG_MASK | X86_PTE_AVL_MASK | X86_PTE_PAT | X86_PTE_PCD | X86_PTE_PWT))
                              | (HCPhys & X86_PTE_PAE_PG_MASK);
+#endif
                 }
             }