Changeset 7953 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

Timestamp:

Apr 14, 2008 3:42:43 PM (17 years ago)

Author:

vboxsync

Message:

PAE monitoring changes

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (8 diffs)

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

@@ -414 +414 @@
              */
             RTGCUINTPTR GCPtr = (RTGCUINTPTR)pVM->pgm.s.GCPtrCR3Mapping + PAGE_SIZE;
-            for (unsigned i = 0; i < 4; i++, GCPtr += PAGE_SIZE)
+            for (unsigned i = 0; i < X86_PG_PAE_PDPE_ENTRIES; i++, GCPtr += PAGE_SIZE)
             {
                 if (pVM->pgm.s.CTXSUFF(pGstPaePDPT)->a[i].n.u1Present)
@@ -473 +473 @@
     pVM->pgm.s.pGstPaePDPTHC = 0;
     pVM->pgm.s.pGstPaePDPTGC = 0;
-    /** PAE todo: pVM->pgm.s.apGstPaePDsHC? -> unmap?? */
+    for (unsigned i=0; i < X86_PG_PAE_PDPE_ENTRIES; i++)
+    {
+        pVM->pgm.s.apGstPaePDsHC[i]    = 0;
+        pVM->pgm.s.apGstPaePDsGC[i]    = 0;        
+        pVM->pgm.s.aGCPhysGstPaePDs[i] = NIL_RTGCPHYS;
+    }
 
 #elif PGM_GST_TYPE == PGM_TYPE_AMD64
@@ -542 +547 @@
 
 #if PGM_GST_TYPE == PGM_TYPE_PAE
+    /* Monitor the PDPT page */
+# ifndef PGMPOOL_WITH_MIXED_PT_CR3
+    AssertFailed();
+# else
+    rc = pgmPoolMonitorMonitorCR3(pVM->pgm.s.CTXSUFF(pPool), PGMPOOL_IDX_PDPT, GCPhysCR3);
+# endif
     /*
      * Do the 4 PDs.
      */
-    for (unsigned i = 0; i < 4; i++)
+    for (unsigned i = 0; i < X86_PG_PAE_PDPE_ENTRIES; i++)
     {
         if (CTXSUFF(pVM->pgm.s.pGstPaePDPT)->a[i].n.u1Present)
@@ -565 +576 @@
             }
 # else  /* PGMPOOL_WITH_MIXED_PT_CR3 */
-            /** PAE todo */
-            AssertFailed();
-            rc = pgmPoolMonitorMonitorCR3(pVM->pgm.s.CTXSUFF(pPool),
-                                             pVM->pgm.s.enmShadowMode == PGMMODE_PAE
-                                          || pVM->pgm.s.enmShadowMode == PGMMODE_PAE_NX
-                                          ? PGMPOOL_IDX_PAE_PD
-                                          : PGMPOOL_IDX_PD,
-                                          GCPhys);
+            Assert(   pVM->pgm.s.enmShadowMode == PGMMODE_PAE 
+                   || pVM->pgm.s.enmShadowMode == PGMMODE_PAE_NX);
+
+            rc = pgmPoolMonitorMonitorCR3(pVM->pgm.s.CTXSUFF(pPool), PGMPOOL_IDX_PAE_PD, GCPhys);
 # endif /* PGMPOOL_WITH_MIXED_PT_CR3 */
             if (VBOX_FAILURE(rc))
@@ -635 +642 @@
 
 # if PGM_GST_TYPE == PGM_TYPE_PAE
+    /* The PDPT page */
+# ifndef PGMPOOL_WITH_MIXED_PT_CR3
+    AssertFailed();
+# else
+    rc = pgmPoolMonitorUnmonitorCR3(pVM->pgm.s.CTXSUFF(pPool), PGMPOOL_IDX_PDPT);
+    AssertRC(rc);
+# endif
+
     /* The 4 PDs. */
-    for (unsigned i = 0; i < 4; i++)
+    for (unsigned i = 0; i < X86_PG_PAE_PDPE_ENTRIES; i++)
         if (pVM->pgm.s.aGCPhysGstPaePDsMonitored[i] != NIL_RTGCPHYS)
         {
@@ -642 +657 @@
             int rc2 = PGMHandlerPhysicalDeregister(pVM, pVM->pgm.s.aGCPhysGstPaePDsMonitored[i]);
 # else /* PGMPOOL_WITH_MIXED_PT_CR3 */
-            /** PAE todo */
-            AssertFailed();
-            int rc2 = pgmPoolMonitorUnmonitorCR3(pVM->pgm.s.CTXSUFF(pPool),
-                                                    pVM->pgm.s.enmShadowMode == PGMMODE_PAE
-                                                 || pVM->pgm.s.enmShadowMode == PGMMODE_PAE_NX
-                                                 ? PGMPOOL_IDX_PAE_PD
-                                                 : PGMPOOL_IDX_PD);
+            Assert(pVM->pgm.s.enmShadowMode == PGMMODE_PAE || pVM->pgm.s.enmShadowMode == PGMMODE_PAE_NX);
+            int rc2 = pgmPoolMonitorUnmonitorCR3(pVM->pgm.s.CTXSUFF(pPool), PGMPOOL_IDX_PAE_PD);
 # endif /* PGMPOOL_WITH_MIXED_PT_CR3 */
             AssertRC(rc2);
@@ -986 +996 @@
          * We'll simply check all of them instead of figuring out which one/two to check.
          */
-        for (unsigned i = 0; i < 4; i++)
+        for (unsigned i = 0; i < X86_PG_PAE_PDPE_ENTRIES; i++)
         {
             if (    CTXSUFF(pVM->pgm.s.pGstPaePDPT)->a[i].n.u1Present
@@ -1052 +1062 @@
          */
         RTGCUINTPTR i;
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < X86_PG_PAE_PDPE_ENTRIES; i++)
             if (CTXSUFF(pVM->pgm.s.pGstPaePDPT)->a[i].u == (GCPhysFault & X86_PTE_PAE_PG_MASK))
             {