Changeset 16641 in vbox for trunk/src

Timestamp:

Feb 10, 2009 3:50:04 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: PAE guest mode invalidation changes

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -581 +581 @@
                     LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw=%#x!\n", iShw));
                 }
-#ifdef PGMPOOL_INVALIDATE_UPPER_SHADOW_TABLE_ENTRIES
+#if defined(PGMPOOL_INVALIDATE_UPPER_SHADOW_TABLE_ENTRIES) || defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
                 /*
                  * Causes trouble when the guest uses a PDE to refer to the whole page table level
@@ -594 +594 @@
                         pgmPoolFree(pPool->CTX_SUFF(pVM),
                                     uShw.pPDPae->a[iShw].u & X86_PDE_PAE_PG_MASK,
+# ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+                                    pPage->idx,
+                                    iShw);
+# else
                                     /* Note: hardcoded PAE implementation dependency */
                                     (pPage->enmKind == PGMPOOLKIND_PAE_PD_FOR_PAE_PD) ? PGMPOOL_IDX_PAE_PD : pPage->idx,
                                     (pPage->enmKind == PGMPOOLKIND_PAE_PD_FOR_PAE_PD) ? iShw + (pPage->idx - PGMPOOL_IDX_PAE_PD_0) * X86_PG_PAE_ENTRIES : iShw);
+# endif
                         uShw.pPDPae->a[iShw].u = 0;
                     }
@@ -617 +622 @@
                         LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw2=%#x!\n", iShw2));
                     }
-#ifdef PGMPOOL_INVALIDATE_UPPER_SHADOW_TABLE_ENTRIES
+#if defined(PGMPOOL_INVALIDATE_UPPER_SHADOW_TABLE_ENTRIES) || defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
                     else if (uShw.pPDPae->a[iShw2].n.u1Present)
                     {
@@ -623 +628 @@
                         pgmPoolFree(pPool->CTX_SUFF(pVM),
                                     uShw.pPDPae->a[iShw2].u & X86_PDE_PAE_PG_MASK,
+# ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+                                    pPage->idx,
+                                    iShw2);
+# else
                                     /* Note: hardcoded PAE implementation dependency */
                                     (pPage->enmKind == PGMPOOLKIND_PAE_PD_FOR_PAE_PD) ? PGMPOOL_IDX_PAE_PD : pPage->idx,
                                     (pPage->enmKind == PGMPOOLKIND_PAE_PD_FOR_PAE_PD) ? iShw2 + (pPage->idx - PGMPOOL_IDX_PAE_PD_0) * X86_PG_PAE_ENTRIES : iShw2);
+# endif
                         uShw.pPDPae->a[iShw2].u = 0;
                     }
@@ -2944 +2954 @@
      */
     PPGMPOOLPAGE pUserPage = &pPool->aPages[pUser->iUser];
-#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+#if defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0) && !defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
     if (pUserPage->enmKind == PGMPOOLKIND_ROOT_PAE_PD)
     {