Changeset 12407 in vbox for trunk

Timestamp:

Sep 11, 2008 3:28:42 PM (16 years ago)

Author:

vboxsync

Message:

Refined the PGM pool flush check. No need to flush when switching between real & protected mode.

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (1 diff)
• src/VBox/VMM/PGM.cpp (modified) (1 diff)

trunk/include/VBox/pgm.h

@@ -261 +261 @@
     PGMMODE_32BIT_HACK = 0x7fffffff
 } PGMMODE;
+
+/** Macro for checking if the guest is using paging.
+ * @param uType     PGMMODE_*
+ * @remark  ASSUMES certain order of the PGMMODE_* values.
+ */
+#define PGMMODE_WITH_PAGING(enmMode) (enmMode >= PGMMODE_32_BIT)
 
 /**

trunk/src/VBox/VMM/PGM.cpp

@@ -3244 +3244 @@
      * switch shadow paging mode (e.g. protected->32-bit) and shouldn't reuse
      * the shadow page tables.
+     *
+     * That only applies when switching between paging and non-paging modes. 
+     *
+     * @todo A20 setting
      */
     if (   pVM->pgm.s.CTXSUFF(pPool)
-        && pVM->pgm.s.enmGuestMode != enmGuestMode)
+        && PGMMODE_WITH_PAGING(pVM->pgm.s.enmGuestMode) != PGMMODE_WITH_PAGING(enmGuestMode))
     {
         Log(("PGMR3ChangeMode: changing guest paging mode -> flush pgm pool cache!\n"));