儲存庫 vbox 的更動 100312

時間撮記:

2023-6-28 上午10:28:59 (21 月 以前)

作者:

vboxsync

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

158027

訊息:

Runtime/r3/test.cpp: Replace occurences of PAGE_SIZE/PAGE_OFFSET_MASK with RTSystemGetPageSize()/RTSystemGetPageOffsetMask() in code which is used by the linux.arm64 guest additions / validationkit, bugref:10476

檔案:

• trunk/src/VBox/Runtime/r3/test.cpp (修改) (6 筆差異)

trunk/src/VBox/Runtime/r3/test.cpp

@@ -53 +53 @@
 #include <iprt/string.h>
 #include <iprt/stream.h>
+#include <iprt/system.h>
 
 #include "internal/magics.h"
@@ -98 +99 @@
     /** The length of the test name.  */
     size_t              cchTest;
-    /** The size of a guard. Multiple of PAGE_SIZE. */
+    /** The size of a guard. Multiple of system page size. */
     uint32_t            cbGuard;
     /** The verbosity level. */
@@ -266 +267 @@
     pTest->pszTest          = RTStrDup(pszTest);
     pTest->cchTest          = strlen(pszTest);
-    pTest->cbGuard          = PAGE_SIZE * 7;
+    pTest->cbGuard          = RTSystemGetPageSize() * 7;
     pTest->enmMaxLevel      = enmMaxLevel == RTTESTLVL_INVALID ? RTTESTLVL_INFO : enmMaxLevel;
     pTest->fFlags           = fFlags;
@@ -576 +577 @@
     if (cbAlign == 0)
         cbAlign = 1;
-    AssertReturn(cbAlign <= PAGE_SIZE, VERR_INVALID_PARAMETER);
+    uint32_t const cbPage = RTSystemGetPageSize();
+    AssertReturn(cbAlign <= cbPage, VERR_INVALID_PARAMETER);
     AssertReturn(cbAlign == (UINT32_C(1) << (ASMBitFirstSetU32(cbAlign) - 1)), VERR_INVALID_PARAMETER);
 
@@ -586 +588 @@
     if (RT_LIKELY(pMem))
     {
-        size_t const    cbAligned = RT_ALIGN_Z(cb, PAGE_SIZE);
+        size_t const    cbAligned = RT_ALIGN_Z(cb, cbPage);
         pMem->aGuards[0].cb = pMem->aGuards[1].cb = pTest->cbGuard;
         pMem->cbAlloc       = pMem->aGuards[0].cb + pMem->aGuards[1].cb + cbAligned;
@@ -597 +599 @@
             if (!fHead)
             {
-                size_t off = cb & PAGE_OFFSET_MASK;
+                size_t off = cb & RTSystemGetPageOffsetMask();
                 if (off)
                 {
-                    off = PAGE_SIZE - RT_ALIGN_Z(off, cbAlign);
+                    off = cbPage - RT_ALIGN_Z(off, cbAlign);
                     pMem->pvUser = (uint8_t *)pMem->pvUser + off;
                 }