Changeset 93931 in vbox for trunk/src/bldprogs

Timestamp:

Feb 24, 2022 4:02:00 PM (3 years ago)

Author:

vboxsync

Message:

VMM,VMMDev,scm,VBox/param.h: Don't use PAGE_BASE_GC_MASK and friends in the VMM. bugref:9898

Location:

trunk/src/bldprogs

Files:

• scm.cpp (modified) (1 diff)
• scmrw.cpp (modified) (2 diffs)

trunk/src/bldprogs/scm.cpp

@@ -2919 +2919 @@
             case SCMOPT_ONLY_GUEST_HOST_PAGE:
                 RTPrintf("      No PAGE_SIZE, PAGE_SHIFT or PAGE_OFFSET_MASK allowed, must have\n"
-                         "      GUEST_ or HOST_ prefix.  Default: %RTbool\n", g_Defaults.fOnlyGuestHostPage);
+                         "      GUEST_ or HOST_ prefix.  Also forbids use of PAGE_BASE_MASK,\n"
+                         "      PAGE_BASE_HC_MASK and PAGE_BASE_GC_MASK  Default: %RTbool\n", g_Defaults.fOnlyGuestHostPage);
                 break;
             case SCMOPT_NO_ASM_MEM_PAGE_USE:

trunk/src/bldprogs/scmrw.cpp

@@ -3254 +3254 @@
 /**
  * Checks for PAGE_SIZE, PAGE_SHIFT and PAGE_OFFSET_MASK w/o a GUEST_ or HOST_
- * prefix.
+ * prefix as well as banning PAGE_BASE_HC_MASK, PAGE_BASE_GC_MASK and
+ * PAGE_BASE_MASK.
  *
  * @returns true if modifications were made, false if not.
@@ -3272 +3273 @@
         { RT_STR_TUPLE("PAGE_SHIFT") },
         { RT_STR_TUPLE("PAGE_OFFSET_MASK") },
+        { RT_STR_TUPLE("PAGE_BASE_MASK") },
+        { RT_STR_TUPLE("PAGE_BASE_GC_MASK") },
+        { RT_STR_TUPLE("PAGE_BASE_HC_MASK") },
         { RT_STR_TUPLE("ASMMemIsZeroPage") },
         { RT_STR_TUPLE("ASMMemZeroPage") },
     };
-    size_t const iFirstWord = pSettings->fOnlyGuestHostPage ? 0 : 3;
-    size_t const iEndWords  = pSettings->fNoASMMemPageUse   ? 5 : 3;
+    size_t const iFirstWord = pSettings->fOnlyGuestHostPage ? 0 : 5;
+    size_t const iEndWords  = pSettings->fNoASMMemPageUse   ? 7 : 5;
 
     uint32_t    iLine = 0;