Changeset 17483 in vbox for trunk/src/VBox/VMM/PGMInternal.h

Timestamp:

Mar 6, 2009 3:59:52 PM (16 years ago)

Author:

vboxsync

Message:

Cleaned up nested paging init and removed obsolete structure members.

File:

• trunk/src/VBox/VMM/PGMInternal.h (modified) (3 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -2344 +2344 @@
     /** @} */
 
+# ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
     /** @name Shadow paging
      * @{ */
     /** The root page table - R3 Ptr. */
     R3PTRTYPE(void *)               pShwRootR3;
-# ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
+#  ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
     /** The root page table - R0 Ptr. */
     R0PTRTYPE(void *)               pShwRootR0;
-# endif
+#  endif
     /** The root page table - RC Ptr. */
     RCPTRTYPE(void *)               pShwRootRC;
-# if HC_ARCH_BITS == 64
+#  if HC_ARCH_BITS == 64
     uint32_t                        u32Padding1; /**< alignment padding. */
-# endif
+#  endif
     /** The Physical Address (HC) of the current active shadow CR3. */
     RTHCPHYS                        HCPhysShwCR3;
+# endif
     /** Pointer to the page of the current active CR3 - R3 Ptr. */
     R3PTRTYPE(PPGMPOOLPAGE)         pShwPageCR3R3;
@@ -3064 +3066 @@
 int             pgmR0DynMapHCPageCommon(PVM pVM, PPGMMAPSET pSet, RTHCPHYS HCPhys, void **ppv);
 #endif
-#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+#if !defined(VBOX_WITH_PGMPOOL_PAGING_ONLY) && (defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0))
 void           *pgmPoolMapPageFallback(PPGM pPGM, PPGMPOOLPAGE pPage);
 #endif
@@ -3523 +3525 @@
         return pv;
     }
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+    AssertFatalMsg(("pgmPoolMapPageInlined invalid page index %x\n", pPage->idx));
+#else
     return pgmPoolMapPageFallback(pPGM, pPage);
+#endif
 }