Changeset 13685 in vbox

Timestamp:

Oct 30, 2008 6:59:39 PM (16 years ago)

Author:

vboxsync

Message:

DBGFMem.cpp: Just exclude the whole above 4GB & AMD64-paging checks if GC_ARCH_BITS == 32.

File:

• trunk/src/VBox/VMM/DBGFMem.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/DBGFMem.cpp

@@ -75 +75 @@
     else
     {
-        if (
 #if GC_ARCH_BITS > 32
-                (   pAddress->FlatPtr >= _4G
+        if (    (   pAddress->FlatPtr >= _4G
                  || pAddress->FlatPtr + cbRange > _4G)
-            &&
-#endif
-                enmMode != PGMMODE_AMD64
+            &&  enmMode != PGMMODE_AMD64
             &&  enmMode != PGMMODE_AMD64_NX)
             return VERR_DBGF_MEM_NOT_FOUND;
+#endif
         RTGCUINTPTR GCPtrHit;
         rc = PGMR3DbgScanVirtual(pVM, pAddress->FlatPtr, cbRange, pabNeedle, cbNeedle, &GCPtrHit);
@@ -157 +155 @@
     else
     {
-        if (
 #if GC_ARCH_BITS > 32
-                (   pAddress->FlatPtr >= _4G
+        if (    (   pAddress->FlatPtr >= _4G
                  || pAddress->FlatPtr + cbRead > _4G)
-            &&
-#endif
-                enmMode != PGMMODE_AMD64
+            &&  enmMode != PGMMODE_AMD64
             &&  enmMode != PGMMODE_AMD64_NX)
             return VERR_PAGE_TABLE_NOT_PRESENT;
+#endif
         rc = PGMPhysSimpleReadGCPtr(pVM, pvBuf, pAddress->FlatPtr, cbRead);
     }
@@ -226 +222 @@
     else
     {
-        if (
 #if GC_ARCH_BITS > 32
-                (   pAddress->FlatPtr >= _4G
+        if (    (   pAddress->FlatPtr >= _4G
                  || pAddress->FlatPtr + cchBuf > _4G)
-            &&
-#endif
-                enmMode != PGMMODE_AMD64
+            &&  enmMode != PGMMODE_AMD64
             &&  enmMode != PGMMODE_AMD64_NX)
             return VERR_PAGE_TABLE_NOT_PRESENT;
+#endif
         rc = PGMPhysSimpleReadGCPtr(pVM, pszBuf, pAddress->FlatPtr, cchBuf);
     }