Changeset 41420 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

May 23, 2012 3:14:05 PM (13 years ago)

Author:

vboxsync

Message:

PGM: More A20 fixes.

File:

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

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

@@ -1632 +1632 @@
         RTGCPHYS GCPhysPage = GST_GET_PTE_GCPHYS(PteSrc);
 # endif
+        PGM_A20_ASSERT_MASKED(pVCpu, GCPhysPage);
+
         /*
          * Find the ram range.
@@ -2243 +2245 @@
             if (!SHW_PTE_IS_P(pPTDst->a[iPTDst]))
             {
-                RTGCPTR GCPtrCurPage = (GCPtrPage & ~(RTGCPTR)(SHW_PT_MASK << SHW_PT_SHIFT)) | (iPTDst << PAGE_SHIFT);
+                RTGCPTR GCPtrCurPage = PGM_A20_APPLY(pVCpu, (GCPtrPage & ~(RTGCPTR)(SHW_PT_MASK << SHW_PT_SHIFT))
+                                                          | (iPTDst << PAGE_SHIFT));
 
                 PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], GCPtrCurPage, pShwPage, iPTDst);
@@ -2262 +2265 @@
     {
         const unsigned  iPTDst       = (GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK;
-        RTGCPTR         GCPtrCurPage = (GCPtrPage & ~(RTGCPTR)(SHW_PT_MASK << SHW_PT_SHIFT)) | (iPTDst << PAGE_SHIFT);
+        RTGCPTR         GCPtrCurPage = PGM_A20_APPLY(pVCpu, (GCPtrPage & ~(RTGCPTR)(SHW_PT_MASK << SHW_PT_SHIFT))
+                                                          | (iPTDst << PAGE_SHIFT));
 
         PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], GCPtrCurPage, pShwPage, iPTDst);
@@ -3199 +3203 @@
 
         /* Mask away the page offset. */
-        GCPtrPage &= ~((RTGCPTR)0xfff);
+        GCPtrPage &= ~(RTGCPTR)PAGE_OFFSET_MASK;
 
         for (unsigned iPTDst = 0; iPTDst < RT_ELEMENTS(pPTDst->a); iPTDst++)
@@ -3208 +3212 @@
             PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], GCPtrCurPage, pShwPage, iPTDst);
             Log2(("SyncPage: 4K+ %RGv PteSrc:{P=1 RW=1 U=1} PteDst=%08llx%s\n",
-                    GCPtrCurPage,
-                    SHW_PTE_LOG64(pPTDst->a[iPTDst]),
-                    SHW_PTE_IS_TRACK_DIRTY(pPTDst->a[iPTDst]) ? " Track-Dirty" : ""));
+                  GCPtrCurPage,
+                  SHW_PTE_LOG64(pPTDst->a[iPTDst]),
+                  SHW_PTE_IS_TRACK_DIRTY(pPTDst->a[iPTDst]) ? " Track-Dirty" : ""));
 
             if (RT_UNLIKELY(VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY)))
@@ -3676 +3680 @@
  * @param   pVM         The virtual machine.
  * @param   pVCpu       The VMCPU handle.
- * @param   cr3         Guest context CR3 register
- * @param   cr4         Guest context CR4 register
+ * @param   cr3         Guest context CR3 register.
+ * @param   cr4         Guest context CR4 register.
  * @param   GCPtr       Where to start. Defaults to 0.
  * @param   cb          How much to check. Defaults to everything.
@@ -4451 +4455 @@
 
     LogFlow(("MapCR3: %RGp\n", GCPhysCR3));
+    PGM_A20_ASSERT_MASKED(pVCpu, GCPhysCR3);
 
     /*
@@ -4572 +4577 @@
 
     Assert(!pVM->pgm.s.fNestedPaging);
+    PGM_A20_ASSERT_MASKED(pVCpu, GCPhysCR3);
 
     /*