Changeset 17485 in vbox

Timestamp:

Mar 6, 2009 4:13:27 PM (16 years ago)

Author:

vboxsync

Message:

Fixes to pgmPhysWriteHandler and PGMPhysGCPhys2R3Ptr (new phys code).

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (2 diffs)

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

@@ -1174 +1174 @@
     int rc = pgmPhysGetPageAndRangeEx(&pVM->pgm.s, GCPhys, &pPage, &pRam);
     if (RT_SUCCESS(rc))
-        rc = pgmPhysGCPhys2CCPtrInternal(pVM, pPage, GCPhys, (void **)&pR3Ptr);
+        rc = pgmPhysGCPhys2CCPtrInternal(pVM, pPage, GCPhys, (void **)pR3Ptr);
 
     pgmUnlock(pVM);
@@ -1936 +1936 @@
                 pVirtPhys = (PPGMPHYS2VIRTHANDLER)RTAvlroGCPhysGetBestFit(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysToVirtHandlers,
                                                                           GCPhys, true /* fAbove */);
-                if (pVirtPhys)
+                if (    pVirtPhys
+                    &&  (pVirtPhys->Core.Key >> PAGE_SHIFT) == (GCPhys >> PAGE_SHIFT))
                 {
                     /* ASSUME that pVirtPhys only covers one page. */
                     Assert((pVirtPhys->Core.Key >> PAGE_SHIFT) == (pVirtPhys->Core.KeyLast >> PAGE_SHIFT));
-                    pVirt = (PPGMVIRTHANDLER)((uintptr_t)pVirtPhys + pVirtPhys->offVirtHandler);
-                    iVirtPage = pVirtPhys - &pVirt->aPhysToVirt[0]; Assert(iVirtPage == 0);
-                    offVirtLast = pVirtPhys->Core.KeyLast & PAGE_OFFSET_MASK - (GCPhys & PAGE_OFFSET_MASK);
+                    Assert(pVirtPhys->Core.Key > GCPhys);
+
+                    pVirt       = (PPGMVIRTHANDLER)((uintptr_t)pVirtPhys + pVirtPhys->offVirtHandler);
+                    iVirtPage   = pVirtPhys - &pVirt->aPhysToVirt[0]; Assert(iVirtPage == 0);
+                    offVirt     = (pVirtPhys->Core.Key     & PAGE_OFFSET_MASK) - (GCPhys & PAGE_OFFSET_MASK);
+                    offVirtLast = (pVirtPhys->Core.KeyLast & PAGE_OFFSET_MASK) - (GCPhys & PAGE_OFFSET_MASK);
                 }
                 else
                 {
-                    pVirt     = NULL;
-                    fMoreVirt = false;
-                    offVirt   = offVirtLast = PAGE_SIZE;
+                    pVirt       = NULL;
+                    fMoreVirt   = false;
+                    offVirt     = offVirtLast = PAGE_SIZE;
                 }
             }