Changeset 108931 in vbox for trunk/src/VBox/VMM/testcase

Timestamp:

Apr 10, 2025 12:25:42 PM (4 weeks ago)

Author:

vboxsync

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

168440

Message:

VMM/testcase/tstPGMAllGst-armv8.cpp: Allow creating page table entries using named objects to make the layout more obvious, bugref:10388

Location:

trunk/src/VBox/VMM/testcase

Files:

• tstPGMAllGst-armv8.cpp (modified) (4 diffs)
• tstPGMAllGst-armv8.json (modified) (1 diff)

trunk/src/VBox/VMM/testcase/tstPGMAllGst-armv8.cpp

@@ -143 +143 @@
     PCTSTMEMCHUNK pChunk = (PCTSTMEMCHUNK)RTAvlrU64RangeGet(&g_MmuCfg.TreeMem, GCPhys);
     if (!pChunk)
-    {
-        *ppv = (void *)&g_abRTZero64K[0]; /* This ASSUMES that the page table walking code will never access beyond the end of this page. */
-        return VINF_SUCCESS;
-    }
+        return VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS;
 
     uint64_t const off = GCPhys - pChunk->Core.Key;
@@ -289 +286 @@
         switch (enmType)
         {
+            case RTJSONVALTYPE_TRUE:
+            case RTJSONVALTYPE_FALSE:
+            {
+                if (paBitfields[idx].cBits == 1)
+                    u64 |= (enmType == RTJSONVALTYPE_TRUE ? 1 : 0) << paBitfields[idx].offBitfield;
+                else
+                    RTTestFailed(hTest, "Bitfield '%s' is more than 1 bit wide", paBitfields[idx].pszName);
+
+                break;
+            }
             case RTJSONVALTYPE_INTEGER:
             {
@@ -299 +306 @@
                 }
                 else if (   i64Tmp < 0
-                         || (uint64_t)i64Tmp > (RT_BIT_64(paBitfields[idx].cBits) - 1))
+                         || (   paBitfields[idx].cBits < 64
+                             && (uint64_t)i64Tmp > (RT_BIT_64(paBitfields[idx].cBits) - 1)))
                 {
                     RTTestFailed(hTest, "Value of \"%s\" is out of bounds, got %#RX64, maximum is %#RX64",
@@ -539 +547 @@
             break;
         }
+        case RTJSONVALTYPE_OBJECT:
+        {
+            static const TSTCFGNAMEDVALUE s_aApPerm[] =
+            {
+                { "PRW",  0 },
+                { "UPRW", 1 },
+                { "PR",   2 },
+                { "UPR",  3 },
+                { NULL,   0 }
+            };
+            static const TSTCFGBITFIELD s_aTblBitfields[] =
+            {
+#define BITFIELD_CREATE_BOOL(a_Name, a_offBit) \
+                { a_Name, a_offBit, 1, NULL }
+
+                { "Raw",       0, 64, NULL         },
+                { "SwUse",    55,  4, NULL         },
+                BITFIELD_CREATE_BOOL("UXN", 54),
+                BITFIELD_CREATE_BOOL("PXN", 53),
+                { "PhysAddr", 0, 64, NULL          },
+                BITFIELD_CREATE_BOOL("AF",  10),
+                { "AP",       6,  2, &s_aApPerm[0] },
+                BITFIELD_CREATE_BOOL("T",    1),
+                BITFIELD_CREATE_BOOL("V",    0),
+                { NULL,     0, 0, NULL }
+
+#undef BITFIELD_CREATE_BOOL
+            };
+
+            uint64_t u64Val = 0;
+            rc = tstMmuCfgReadBitfieldU64(hTest, hMemObj, &s_aTblBitfields[0], &u64Val);
+            if (RT_SUCCESS(rc))
+                rc = tstTestcaseMmuMemoryWrite(hTest, pMmuCfg, GCPhysAddr, &u64Val, sizeof(u64Val));
+            break;
+        }
         default:
             RTTestFailed(hTest, "Memory object has an invalid type %d\n", enmType);

trunk/src/VBox/VMM/testcase/tstPGMAllGst-armv8.json

@@ -58 +58 @@
         AddressSpace:
         {
-            0x0:    0x0000000000001fff,
-            0x1000: 0x0000c000000000fd,
+            0x0:    {                 PhysAddr:             0x1000,             T: 1, V: 1},
+            0x1000: { UXN: 0, PXN: 0, PhysAddr: 0x0000c00000000000, AP: 'UPR',  T: 0, V: 1},
         },