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

Timestamp:

Jun 13, 2008 4:03:19 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

32030

Message:

Partly backed out previous changeset

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (1 diff)
• PGMAllShw.h (modified) (1 diff)

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

@@ -3017 +3017 @@
                                 && !(pPDDst->a[iPD].u & PGM_PDFLAGS_MAPPING))
                             {
-                                AssertCompile(PGMPOOL_IDX_AMD64_PD == SHW_POOL_ROOT_IDX);
-                                pgmPoolFreeByPage(pPool, pgmPoolGetPage(pPool, pPDDst->a[iPD].u & SHW_PDE_PG_MASK), PGMPOOL_IDX_AMD64_PD, (iPML4E * X86_PG_PAE_ENTRIES + iPDPTE) * X86_PG_PAE_ENTRIES + iPD);
+                                pgmPoolFreeByPage(pPool, pgmPoolGetPage(pPool, pPDDst->a[iPD].u & SHW_PDE_PG_MASK), SHW_POOL_ROOT_IDX, (iPML4E * X86_PG_PAE_ENTRIES + iPDPTE) * X86_PG_PAE_ENTRIES + iPD);
                                 pPDDst->a[iPD].u = 0;
                             }

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

@@ -78 +78 @@
 # define SHW_PDPT_MASK         X86_PDPT_MASK_AMD64
 # define SHW_TOTAL_PD_ENTRIES   (X86_PG_AMD64_ENTRIES*X86_PG_AMD64_PDPE_ENTRIES)
-# define SHW_POOL_ROOT_IDX      PGMPOOL_IDX_AMD64_PD
+# define SHW_POOL_ROOT_IDX      PGMPOOL_IDX_PAE_PD
 #else /* 32 bits PAE mode */
 # define SHW_PDPT_SHIFT        X86_PDPT_SHIFT