Changeset 100310 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

Jun 28, 2023 10:26:46 AM (20 months ago)

Author:

vboxsync

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

158025

Message:

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

Location:

trunk/src/VBox/Runtime/r3/posix

Files:

• RTMemProtect-posix.cpp (modified) (2 diffs)
• rtmempage-exec-mmap-posix.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/posix/RTMemProtect-posix.cpp

@@ -44 +44 @@
 #include <iprt/errcore.h>
 #include <iprt/string.h>
+#include <iprt/system.h>
 
 #include <errno.h>
@@ -93 +94 @@
      * Align the request.
      */
-    cb += (uintptr_t)pv & PAGE_OFFSET_MASK;
-    pv = (void *)((uintptr_t)pv & ~PAGE_OFFSET_MASK);
+    cb += (uintptr_t)pv & RTSystemGetPageOffsetMask();
+    pv = (void *)((uintptr_t)pv & ~RTSystemGetPageOffsetMask());
 
     /*

trunk/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp

@@ -47 +47 @@
 #include <iprt/param.h>
 #include <iprt/string.h>
+#include <iprt/system.h>
 
 #include <stdlib.h>
@@ -106 +107 @@
     Assert(cb > 0);
     NOREF(pszTag);
-    cb = RT_ALIGN_Z(cb, PAGE_SIZE);
+    cb = RTSystemPageAlignSize(cb);
 
     /*
@@ -143 +144 @@
     AssertPtr(pv);
     Assert(cb > 0);
-    Assert(!((uintptr_t)pv & PAGE_OFFSET_MASK));
-    cb = RT_ALIGN_Z(cb, PAGE_SIZE);
+    Assert(!((uintptr_t)pv & RTSystemGetPageOffsetMask()));
+    cb = RTSystemPageAlignSize(cb);
 
     /*