Changeset 9692 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

Partly backed out previous changeset

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• PGMPool.cpp (modified) (1 diff)
• VMMAll/PGMAllBth.h (modified) (1 diff)
• VMMAll/PGMAllShw.h (modified) (1 diff)

trunk/src/VBox/VMM/PGMInternal.h

@@ -1287 +1287 @@
 /** PAE Page Directory Table 3. */
 #define PGMPOOL_IDX_PAE_PD_3    6
-/** AMD64 Page Directory Table. */
-#define PGMPOOL_IDX_AMD64_PD    7
 /** Page Directory Pointer Table (PAE root, not currently used). */
-#define PGMPOOL_IDX_PDPT        8
+#define PGMPOOL_IDX_PDPT        7
 /** Page Map Level-4 (64-bit root). */
-#define PGMPOOL_IDX_PML4        9
+#define PGMPOOL_IDX_PML4        8
 /** The first normal index. */
-#define PGMPOOL_IDX_FIRST       10
+#define PGMPOOL_IDX_FIRST       9
 /** The last valid index. (inclusive, 14 bits) */
 #define PGMPOOL_IDX_LAST        0x3fff

trunk/src/VBox/VMM/PGMPool.cpp

@@ -259 +259 @@
         pPool->aPages[PGMPOOL_IDX_PAE_PD_0 + i].idx       = PGMPOOL_IDX_PAE_PD_0 + i;
     }
-
+  
     /* The Shadow PDPT. */
     pPool->aPages[PGMPOOL_IDX_PDPT].Core.Key  = NIL_RTHCPHYS;

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