Changeset 8002 in vbox

Timestamp:

Apr 15, 2008 3:12:54 PM (17 years ago)

Author:

vboxsync

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

29658

Message:

Backed out 29657

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (6 diffs)

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

@@ -2678 +2678 @@
     {
         pMapping      = pVM->pgm.s.CTXALLSUFF(pMappings);
-        iPdNoMapping  = (pMapping) ? pMapping->GCPtr >> SHW_PD_SHIFT : ~0U;
+        iPdNoMapping  = (pMapping) ? pMapping->GCPtr >> X86_PD_SHIFT : ~0U;     /** PAE todo */
     }
     else
@@ -2742 +2742 @@
                         pPDEDst += cPTs + (PGM_SHW_TYPE != PGM_TYPE_32BIT) * cPTs;
                         pMapping = pMapping->CTXALLSUFF(pNext);
-                        iPdNoMapping = pMapping ? pMapping->GCPtr >> SHW_PD_SHIFT : ~0U;
+                        iPdNoMapping = pMapping ? pMapping->GCPtr >> X86_PD_SHIFT : ~0U;
                         continue;
                     }
@@ -2754 +2754 @@
                      */
                     pMapping = pVM->pgm.s.pMappingsR3;
-                    while (pMapping && pMapping->GCPtr < (iPD << SHW_PD_SHIFT))
+                    while (pMapping && pMapping->GCPtr < (iPD << X86_PD_SHIFT))
                         pMapping = pMapping->pNextR3;
-                    iPdNoMapping = pMapping ? pMapping->GCPtr >> SHW_PD_SHIFT : ~0U;
+                    iPdNoMapping = pMapping ? pMapping->GCPtr >> X86_PD_SHIFT : ~0U;
 #   else
                     LogFlow(("SyncCR3: detected conflict -> VINF_PGM_SYNC_CR3\n"));
@@ -2884 +2884 @@
                     /* It's fixed, just skip the mapping. */
                     pMapping = pMapping->CTXALLSUFF(pNext);
-                    iPdNoMapping = pMapping ? pMapping->GCPtr >> SHW_PD_SHIFT : ~0U;
+                    iPdNoMapping = pMapping ? pMapping->GCPtr >> X86_PD_SHIFT : ~0U;
                 }
                 else
@@ -2908 +2908 @@
                              */
                             pMapping = pVM->pgm.s.CTXALLSUFF(pMappings);
-                            while (pMapping && pMapping->GCPtr < (iPD << SHW_PD_SHIFT))
+                            while (pMapping && pMapping->GCPtr < (iPD << X86_PD_SHIFT))
                                 pMapping = pMapping->CTXALLSUFF(pNext);
-                            iPdNoMapping = pMapping ? pMapping->GCPtr >> SHW_PD_SHIFT : ~0U;
+                            iPdNoMapping = pMapping ? pMapping->GCPtr >> X86_PD_SHIFT : ~0U;
                             break;
 #   else
@@ -2922 +2922 @@
                         pMapping = pMapping->CTXALLSUFF(pNext);
                         if (pMapping)
-                            iPdNoMapping = pMapping->GCPtr >> SHW_PD_SHIFT;
+                            iPdNoMapping = pMapping->GCPtr >> X86_PD_SHIFT;
                     }
                 }