Changeset 20947 in vbox for trunk/src/VBox

Timestamp:

Jun 25, 2009 3:37:20 PM (16 years ago)

Author:

vboxsync

Message:

PGMR3DbgScanVirtual: Chop the range so we don't end up above 4GB on a 32-bit guest.

File:

• trunk/src/VBox/VMM/PGMDbg.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/PGMDbg.cpp

@@ -487 +487 @@
      * bother to match across ranges.
      */
+    pgmLock(pVM);
     for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRanges);
          pRam;
@@ -534 +535 @@
                         {
                             *pGCPhysHit = (GCPhys & ~(RTGCPHYS)PAGE_OFFSET_MASK) + offPage;
+                            pgmUnlock(pVM);
                             return VINF_SUCCESS;
                         }
@@ -546 +548 @@
                 GCPhys |= PAGE_OFFSET_MASK;
                 if (GCPhys++ >= GCPhysLast)
+                {
+                    pgmUnlock(pVM);
                     return VERR_DBGF_MEM_NOT_FOUND;
+                }
             }
         }
     }
+    pgmUnlock(pVM);
     return VERR_DBGF_MEM_NOT_FOUND;
 }
@@ -597 +603 @@
      * Search the memory - ignore MMIO, zero and not-present pages.
      */
+    PGMMODE         enmMode   = PGMGetGuestMode(pVCpu);
+    RTGCPTR         GCPtrMask = PGMMODE_IS_LONG_MODE(enmMode) ? UINT64_MAX : UINT32_MAX;
     uint8_t         abPrev[MAX_NEEDLE_SIZE];
-    size_t          cbPrev = 0;
+    size_t          cbPrev    = 0;
     const RTGCPTR   GCPtrLast = GCPtr + cbRange - 1 >= GCPtr
-                              ? GCPtr + cbRange - 1
-                              : ~(RTGCPTR)0;
-    RTGCPTR         cPages = (((GCPtrLast - GCPtr) + (GCPtr & PAGE_OFFSET_MASK)) >> PAGE_SHIFT) + 1;
+                              ? (GCPtr + cbRange - 1) & GCPtrMask
+                              : GCPtrMask;
+    RTGCPTR         cPages    = (((GCPtrLast - GCPtr) + (GCPtr & PAGE_OFFSET_MASK)) >> PAGE_SHIFT) + 1;
     while (cPages-- > 0)
     {
@@ -611 +619 @@
             PPGMPAGE pPage = pgmPhysGetPage(&pVM->pgm.s, GCPhys);
             if (    pPage
-///@todo                 &&  !PGM_PAGE_IS_ZERO(pPage)
+                &&  !PGM_PAGE_IS_ZERO(pPage) /** @todo handle all zero needle. */
                 &&  !PGM_PAGE_IS_MMIO(pPage))
             {
@@ -644 +652 @@
         GCPtr |= PAGE_OFFSET_MASK;
         GCPtr++;
+        GCPtr &= GCPtrMask;
     }
     return VERR_DBGF_MEM_NOT_FOUND;