Changeset 93556 in vbox for trunk/src/bldprogs

Timestamp:

Feb 2, 2022 11:14:47 PM (3 years ago)

Author:

vboxsync

Message:

scm: Added checks for ASMMemIsZeroPage and ASMMemZeroPage too. bugref:9898

Location:

trunk/src/bldprogs

Files:

• scm.cpp (modified) (5 diffs)
• scm.h (modified) (1 diff)
• scmrw.cpp (modified) (3 diffs)

trunk/src/bldprogs/scm.cpp

@@ -90 +90 @@
     SCMOPT_NO_FIX_ERR_H,
     SCMOPT_ONLY_GUEST_HOST_PAGE,
+    SCMOPT_NO_ASM_MEM_PAGE_USE,
+    SCMOPT_UNRESTRICTED_ASM_MEM_PAGE_USE,
     SCMOPT_NO_PAGE_RESTRICTIONS,
     SCMOPT_UPDATE_COPYRIGHT_YEAR,
@@ -199 +201 @@
     /* .fFixErrH = */                               true,
     /* .fOnlyGuestHostPage = */                     false,
+    /* .fNoASMMemPageUse = */                       false,
     /* .fUpdateCopyrightYear = */                   false,
     /* .fExternalCopyright = */                     false,
@@ -254 +257 @@
     { "--only-guest-host-page",             SCMOPT_ONLY_GUEST_HOST_PAGE,            RTGETOPT_REQ_NOTHING },
     { "--no-page-restrictions",             SCMOPT_NO_PAGE_RESTRICTIONS,            RTGETOPT_REQ_NOTHING },
+    { "--no-ASMMemPage-use",                SCMOPT_NO_ASM_MEM_PAGE_USE,             RTGETOPT_REQ_NOTHING },
+    { "--unrestricted-ASMMemPage-use",      SCMOPT_UNRESTRICTED_ASM_MEM_PAGE_USE,   RTGETOPT_REQ_NOTHING },
     { "--update-copyright-year",            SCMOPT_UPDATE_COPYRIGHT_YEAR,           RTGETOPT_REQ_NOTHING },
     { "--no-update-copyright-year",         SCMOPT_NO_UPDATE_COPYRIGHT_YEAR,        RTGETOPT_REQ_NOTHING },
@@ -1184 +1189 @@
         case SCMOPT_NO_PAGE_RESTRICTIONS:
             pSettings->fOnlyGuestHostPage = false;
+            return VINF_SUCCESS;
+
+        case SCMOPT_NO_ASM_MEM_PAGE_USE:
+            pSettings->fNoASMMemPageUse = true;
+            return VINF_SUCCESS;
+        case SCMOPT_UNRESTRICTED_ASM_MEM_PAGE_USE:
+            pSettings->fNoASMMemPageUse = false;
             return VINF_SUCCESS;
 
@@ -2908 +2920 @@
                          "      GUEST_ or HOST_ prefix.  Default: %RTbool\n", g_Defaults.fOnlyGuestHostPage);
                 break;
+            case SCMOPT_NO_ASM_MEM_PAGE_USE:
+                RTPrintf("      No ASMMemIsZeroPage or ASMMemZeroPage allowed, must instead use\n"
+                         "      ASMMemIsZero and RT_BZERO with appropriate page size.  Default: %RTbool\n",
+                         g_Defaults.fNoASMMemPageUse);
+                break;
             case SCMOPT_UPDATE_COPYRIGHT_YEAR:
                 RTPrintf("      Update the copyright year.  Default: %RTbool\n", g_Defaults.fUpdateCopyrightYear);

trunk/src/bldprogs/scm.h

@@ -359 +359 @@
      * or HOST_ prefixed versions. */
     bool            fOnlyGuestHostPage;
+    /** No ASMMemIsZeroPage or ASMMemZeroPage calls allowed (C/C++). */
+    bool            fNoASMMemPageUse;
 
     /** Update the copyright year. */

trunk/src/bldprogs/scmrw.cpp

@@ -3264 +3264 @@
 {
     RT_NOREF(pOut);
-    if (!pSettings->fOnlyGuestHostPage)
-        return false;
+    if (!pSettings->fOnlyGuestHostPage && !pSettings->fNoASMMemPageUse)
+        return false;
+
+    static RTSTRTUPLE const g_aWords[] =
+    {
+        { RT_STR_TUPLE("PAGE_SIZE") },
+        { RT_STR_TUPLE("PAGE_SHIFT") },
+        { RT_STR_TUPLE("PAGE_OFFSET_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;
 
     uint32_t    iLine = 0;
@@ -3274 +3285 @@
     {
         iLine++;
-
-        static RTSTRTUPLE const g_aWords[] =
-        {
-            { RT_STR_TUPLE("PAGE_SIZE") },
-            { RT_STR_TUPLE("PAGE_SHIFT") },
-            { RT_STR_TUPLE("PAGE_OFFSET_MASK") },
-        };
-        for (size_t i = 0; i < RT_ELEMENTS(g_aWords); i++)
+        for (size_t i = iFirstWord; i < iEndWords; i++)
         {
             size_t const cchWord = g_aWords[i].cch;
@@ -3297 +3301 @@
                         && (   cchLeft == cchWord
                             || !ScmIsCIdentifierChar(pchHit[cchWord])) )
-                        ScmFixManually(pState, "%u:%zu: %s is not allow! Use GUEST_%s or HOST_%s instead.\n",
-                                       iLine, pchHit - pchLine, pszWord, pszWord, pszWord);
+                    {
+                        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
+                            ScmFixManually(pState, "%u:%zu: %s is not allow! Use %s with correct page size instead.\n",
+                                           iLine, pchHit - pchLine + 1, pszWord, i == 3 ? "ASMMemIsZero" : "RT_BZERO");
+                    }
 
                     /* next */