Changeset 108658 in vbox

Timestamp:

Mar 20, 2025 3:33:39 PM (8 weeks ago)

Author:

vboxsync

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

168071

Message:

HostDrivers/Support/testcase/tstLow.cpp: Make it work for hosts where we don't know the host page size when building, bugref:10391

File:

• trunk/src/VBox/HostDrivers/Support/testcase/tstLow.cpp (modified) (6 diffs)

trunk/src/VBox/HostDrivers/Support/testcase/tstLow.cpp

@@ -45 +45 @@
 #include <iprt/stream.h>
 #include <iprt/string.h>
+#include <iprt/system.h>
 
 
@@ -58 +59 @@
     if (RT_SUCCESS(rc))
     {
+        uint32_t  const cbPage      = RTSystemGetPageSize();
+        uintptr_t const offPageMask = RTSystemGetPageOffsetMask();
+
         /*
          * Allocate a bit of contiguous memory.
@@ -77 +81 @@
                 }
                 if (    aPages0[iPage].Phys >= _4G
-                    ||  (aPages0[iPage].Phys & PAGE_OFFSET_MASK))
+                    ||  (aPages0[iPage].Phys & offPageMask))
                 {
                     rcRet++;
@@ -86 +90 @@
             {
                 for (unsigned iPage = 0; iPage < RT_ELEMENTS(aPages0); iPage++)
-                    memset((char *)pvPages0 + iPage * PAGE_SIZE, iPage, PAGE_SIZE);
+                    memset((char *)pvPages0 + iPage * cbPage, iPage, cbPage);
                 for (unsigned iPage = 0; iPage < RT_ELEMENTS(aPages0); iPage++)
-                    for (uint8_t *pu8 = (uint8_t *)pvPages0 + iPage * PAGE_SIZE, *pu8End = pu8 + PAGE_SIZE; pu8 < pu8End; pu8++)
+                    for (uint8_t *pu8 = (uint8_t *)pvPages0 + iPage * cbPage, *pu8End = pu8 + cbPage; pu8 < pu8End; pu8++)
                         if (*pu8 != (uint8_t)iPage)
                         {
                             RTPrintf("tstLow: error: invalid page content %02x != %02x. iPage=%u off=%#x\n",
-                                     *pu8, (uint8_t)iPage, iPage, (uintptr_t)pu8 & PAGE_OFFSET_MASK);
+                                     *pu8, (uint8_t)iPage, iPage, (uintptr_t)pu8 & offPageMask);
                             rcRet++;
                         }
@@ -125 +129 @@
                     }
                     if (    aPages1[iPage].Phys >= _4G
-                        ||  (aPages1[iPage].Phys & PAGE_OFFSET_MASK))
+                        ||  (aPages1[iPage].Phys & offPageMask))
                     {
                         rcRet++;
@@ -134 +138 @@
                 {
                     for (unsigned iPage = 0; iPage < cPages; iPage++)
-                        memset((char *)pvPages1 + iPage * PAGE_SIZE, iPage, PAGE_SIZE);
+                        memset((char *)pvPages1 + iPage * cbPage, iPage, cbPage);
                     for (unsigned iPage = 0; iPage < cPages; iPage++)
-                        for (uint8_t *pu8 = (uint8_t *)pvPages1 + iPage * PAGE_SIZE, *pu8End = pu8 + PAGE_SIZE; pu8 < pu8End; pu8++)
+                        for (uint8_t *pu8 = (uint8_t *)pvPages1 + iPage * cbPage, *pu8End = pu8 + cbPage; pu8 < pu8End; pu8++)
                             if (*pu8 != (uint8_t)iPage)
                             {
                                 RTPrintf("tstLow: error: invalid page content %02x != %02x. iPage=%p off=%#x\n",
-                                         *pu8, (uint8_t)iPage, iPage, (uintptr_t)pu8 & PAGE_OFFSET_MASK);
+                                         *pu8, (uint8_t)iPage, iPage, (uintptr_t)pu8 & offPageMask);
                                 rcRet++;
                             }