Changeset 30615 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

Timestamp:

Jul 5, 2010 1:03:59 PM (15 years ago)

Author:

vboxsync

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

63343

Message:

PGMAllGst.h: Fixed >= _4G tests, bad a #if statement was copied around...

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (4 diffs)

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

@@ -59 +59 @@
 #elif PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_PAE || PGM_GST_TYPE == PGM_TYPE_AMD64
 
-#if PGM_GST_MODE != PGM_MODE_AMD64
+# if PGM_GST_TYPE != PGM_MODE_AMD64
     /* Boundary check. */
     if (GCPtr >= _4G)
-        return VERR_INVALID_ADDRESS;
+        return VERR_PAGE_TABLE_NOT_PRESENT;
 # endif
 
@@ -181 +181 @@
     Assert((cb & PAGE_OFFSET_MASK) == 0);
 
-#if PGM_GST_MODE != PGM_MODE_AMD64
+# if PGM_GST_TYPE != PGM_MODE_AMD64
     /* Boundary check. */
     if (GCPtr >= _4G)
-        return VERR_INVALID_ADDRESS;
+        return VERR_PAGE_TABLE_NOT_PRESENT;
 # endif
 
@@ -292 +292 @@
  || PGM_GST_TYPE == PGM_TYPE_AMD64
 
-#if PGM_GST_MODE != PGM_MODE_AMD64
+# if PGM_GST_TYPE != PGM_MODE_AMD64
     /* Boundary check. */
     if (GCPtr >= _4G)
-        return VERR_INVALID_ADDRESS;
+        return VERR_PAGE_TABLE_NOT_PRESENT;
 # endif
 
@@ -338 +338 @@
 
     RTGCPTR         GCPtr  = pCur->Core.Key;
-#if PGM_GST_MODE != PGM_MODE_AMD64
+#if PGM_GST_TYPE != PGM_MODE_AMD64
     /* skip all stuff above 4GB if not AMD64 mode. */
-    if (GCPtr >= _4GB)
+    if (GCPtr >= _4G)
         return 0;
 #endif