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

Timestamp:

Jun 26, 2008 9:55:02 AM (16 years ago)

Author:

vboxsync

Message:

PAE fixes

File:

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

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

@@ -424 +424 @@
                 {
                     LogFlow(("pgmPoolMonitorChainChanging: pae pd iShw=%#x: %RX64 -> freeing it!\n", iShw, uShw.pPDPae->a[iShw].u));
-                    pgmPoolFree(pPool->CTXSUFF(pVM), uShw.pPDPae->a[iShw].u & X86_PDE_PAE_PG_MASK, pPage->idx, iShw);
+                    pgmPoolFree(pPool->CTXSUFF(pVM), 
+                                uShw.pPDPae->a[iShw].u & X86_PDE_PAE_PG_MASK, 
+                                /* 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);
                     uShw.pPDPae->a[iShw].u = 0;
                 }
@@ -445 +449 @@
                     {
                         LogFlow(("pgmPoolMonitorChainChanging: pae pd iShw2=%#x: %RX64 -> freeing it!\n", iShw2, uShw.pPDPae->a[iShw2].u));
-                        pgmPoolFree(pPool->CTXSUFF(pVM), uShw.pPDPae->a[iShw2].u & X86_PDE_PAE_PG_MASK, pPage->idx, iShw2);
+                        pgmPoolFree(pPool->CTXSUFF(pVM), 
+                                    uShw.pPDPae->a[iShw2].u & X86_PDE_PAE_PG_MASK, 
+                                    /* 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);
                         uShw.pPDPae->a[iShw2].u = 0;
                     }