Changeset 32043 in vbox for trunk/src/VBox

Timestamp:

Aug 27, 2010 11:47:17 AM (14 years ago)

Author:

vboxsync

Message:

PGM: Re-enabled the code that previously cause w7-64 regressions. (We no longer sync any unncessary bits.)

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• PGMPool.cpp (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -421 +421 @@
  * @{
  */
-#if 0
+#if 1
 /**
  * For making sure that u1Present and X86_PTE_P checks doesn't mistake

trunk/src/VBox/VMM/PGMPool.cpp

@@ -868 +868 @@
                     for (unsigned iShw = 0; iShw < RT_ELEMENTS(uShw.pPTPae->a); iShw++)
                     {
-                        if (uShw.pPTPae->a[iShw].n.u1Present)
-                            uShw.pPTPae->a[iShw].n.u1Write = 0;
+                        if (PGMSHWPTEPAE_IS_P(uShw.pPTPae->a[iShw]))
+                            PGMSHWPTEPAE_SET_RO(uShw.pPTPae->a[iShw]);
                     }
                     break;

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

@@ -3071 +3071 @@
             }
 
-#if 1 /** @todo FIXME r64700 regression? */
-            if ((PGMSHWPTEPAE_GET_U(pPT->a[iPte]) & (X86_PTE_PAE_PG_MASK | X86_PTE_P)) == u64)
-#else
             if ((PGMSHWPTEPAE_GET_U(pPT->a[iPte]) & (X86_PTE_PAE_PG_MASK | X86_PTE_P | X86_PTE_PAE_MBZ_MASK_NX)) == u64)
-#endif
             {
                 X86PTEPAE Pte;
@@ -3092 +3088 @@
             Log(("Found %RX64 expected %RX64\n", PGMSHWPTEPAE_GET_U(pPT->a[iPte]) & (X86_PTE_PAE_PG_MASK | X86_PTE_P | X86_PTE_PAE_MBZ_MASK_NX), u64));
             for (unsigned i = 0, cFound = 0; i < RT_ELEMENTS(pPT->a); i++)
-# if 1 /** @todo FIXME r64700 regression? */
-                if ((PGMSHWPTEPAE_GET_U(pPT->a[i]) & (X86_PTE_PAE_PG_MASK | X86_PTE_P)) == u64)
-# else
                 if ((PGMSHWPTEPAE_GET_U(pPT->a[i]) & (X86_PTE_PAE_PG_MASK | X86_PTE_P | X86_PTE_PAE_MBZ_MASK_NX)) == u64)
-# endif
                     Log(("i=%d cFound=%d\n", i, ++cFound));
 #endif