Changeset 100308 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jun 28, 2023 10:24:38 AM (19 months ago)

Author:

vboxsync

Message:

Runtime: Replace occurence of PAGE_SIZE with RTSystemgetPageSize() in code used by linux.arm64 guest additions, bugref:10476

Location:

trunk/src/VBox/Runtime/common

Files:

• alloc/heapoffset.cpp (modified) (1 diff)
• alloc/heapsimple.cpp (modified) (1 diff)
• misc/handletablectx.cpp (modified) (2 diffs)
• misc/handletablesimple.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/alloc/heapoffset.cpp

@@ -380 +380 @@
      * Validate input. The imposed minimum heap size is just a convenient value.
      */
-    AssertReturn(cbMemory >= PAGE_SIZE, VERR_INVALID_PARAMETER);
+    AssertReturn(cbMemory >= _4K, VERR_INVALID_PARAMETER);
     AssertReturn(cbMemory < UINT32_MAX, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pvMemory, VERR_INVALID_POINTER);

trunk/src/VBox/Runtime/common/alloc/heapsimple.cpp

@@ -297 +297 @@
      * Validate input. The imposed minimum heap size is just a convenient value.
      */
-    AssertReturn(cbMemory >= PAGE_SIZE, VERR_INVALID_PARAMETER);
+    AssertReturn(cbMemory >= _4K, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pvMemory, VERR_INVALID_POINTER);
     AssertReturn((uintptr_t)pvMemory + (cbMemory - 1) > (uintptr_t)cbMemory, VERR_INVALID_PARAMETER);

trunk/src/VBox/Runtime/common/misc/handletablectx.cpp

@@ -49 +49 @@
 #include <iprt/string.h>
 #include <iprt/asm.h>
+#include <iprt/system.h>
 #include "internal/magics.h"
 #include "handletable.h"
@@ -118 +119 @@
             uint32_t const  iLevel1 = pThis->cCur / RTHT_LEVEL2_ENTRIES;
             uint32_t        cLevel1 = iLevel1 >= pThis->cLevel1
-                                    ? pThis->cLevel1 + PAGE_SIZE / sizeof(void *)
+                                    ? pThis->cLevel1 + RTSystemGetPageSize() / sizeof(void *)
                                     : 0;
             if (cLevel1 > pThis->cMax / RTHT_LEVEL2_ENTRIES)

trunk/src/VBox/Runtime/common/misc/handletablesimple.cpp

@@ -49 +49 @@
 #include <iprt/string.h>
 #include <iprt/asm.h>
+#include <iprt/system.h>
 #include "internal/magics.h"
 #include "handletable.h"
@@ -110 +111 @@
             uint32_t const iLevel1 = pThis->cCur / RTHT_LEVEL2_ENTRIES;
             uint32_t cLevel1 = iLevel1 >= pThis->cLevel1
-                             ? pThis->cLevel1 + PAGE_SIZE / sizeof(void *)
+                             ? pThis->cLevel1 + RTSystemGetPageSize() / sizeof(void *)
                              : 0;
             if (cLevel1 > pThis->cMax / RTHT_LEVEL2_ENTRIES)