Changeset 93945 in vbox for trunk/src/bldprogs/scmrw.cpp

Timestamp:

Feb 24, 2022 9:16:02 PM (3 years ago)

Author:

vboxsync

Message:

scm: Maded the --only-guest-host-page option include PAGE_ADDRESS and PHYS_PAGE_ADDRESS too. bugref:9898

File:

• trunk/src/bldprogs/scmrw.cpp (modified) (2 diffs)

trunk/src/bldprogs/scmrw.cpp

@@ -3276 +3276 @@
         { RT_STR_TUPLE("PAGE_BASE_GC_MASK") },
         { RT_STR_TUPLE("PAGE_BASE_HC_MASK") },
+        { RT_STR_TUPLE("PAGE_ADDRESS") },
+        { RT_STR_TUPLE("PHYS_PAGE_ADDRESS") },
         { RT_STR_TUPLE("ASMMemIsZeroPage") },
         { RT_STR_TUPLE("ASMMemZeroPage") },
     };
-    size_t const iFirstWord = pSettings->fOnlyGuestHostPage ? 0 : 5;
-    size_t const iEndWords  = pSettings->fNoASMMemPageUse   ? 7 : 5;
+    size_t const iFirstWord = pSettings->fOnlyGuestHostPage ? 0 : 7;
+    size_t const iEndWords  = pSettings->fNoASMMemPageUse   ? 9 : 7;
 
     uint32_t    iLine = 0;
@@ -3306 +3308 @@
                             || !ScmIsCIdentifierChar(pchHit[cchWord])) )
                     {
-                        if (i < 5)
+                        if (i < 3)
                             ScmFixManually(pState, "%u:%zu: %s is not allow! Use GUEST_%s or HOST_%s instead.\n",
                                            iLine, pchHit - pchLine + 1, pszWord, pszWord, pszWord);
+                        else if (i < 7)
+                            ScmFixManually(pState, "%u:%zu: %s is not allow! Rewrite using GUEST/HOST_PAGE_OFFSET_MASK.\n",
+                                           iLine, pchHit - pchLine + 1, pszWord);
                         else
                             ScmFixManually(pState, "%u:%zu: %s is not allow! Use %s with correct page size instead.\n",