Changeset 92726 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Dec 3, 2021 12:00:52 AM (3 years ago)

Author:

vboxsync

Message:

VMM/DBGF: Breakpoint bitmap addresses & sizes must be multiple of 32-bits, see ASMAtomicBitSet and friends. Assert on 64 bits alignment. bugref:9837

File:

• trunk/src/VBox/VMM/VMMR3/DBGFR3Bp.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMR3/DBGFR3Bp.cpp

@@ -417 +417 @@
         && !pUVM->dbgf.s.pbmBpOwnersAllocR3)
     {
-        pUVM->dbgf.s.pbmBpOwnersAllocR3 = (volatile void *)RTMemAllocZ(DBGF_BP_OWNER_COUNT_MAX / 8);
+        AssertCompile(!(DBGF_BP_OWNER_COUNT_MAX % 64));
+        pUVM->dbgf.s.pbmBpOwnersAllocR3 = RTMemAllocZ(DBGF_BP_OWNER_COUNT_MAX / 8);
         if (pUVM->dbgf.s.pbmBpOwnersAllocR3)
         {
@@ -572 +573 @@
     {
         /* Allocate the bitmap first so we can skip calling into VMMR0 if it fails. */
-        AssertCompile(!(DBGF_BP_COUNT_PER_CHUNK % 8));
-        volatile void *pbmAlloc = RTMemAllocZ(DBGF_BP_COUNT_PER_CHUNK / 8);
+        AssertCompile(!(DBGF_BP_COUNT_PER_CHUNK % 64));
+        void *pbmAlloc = RTMemAllocZ(DBGF_BP_COUNT_PER_CHUNK / 8);
         if (RT_LIKELY(pbmAlloc))
         {
@@ -586 +587 @@
             {
                 pBpChunk->pBpBaseR3 = (PDBGFBPINT)Req.pChunkBaseR3;
-                pBpChunk->pbmAlloc   = pbmAlloc;
+                pBpChunk->pbmAlloc  = (void volatile *)pbmAlloc;
                 pBpChunk->cBpsFree  = DBGF_BP_COUNT_PER_CHUNK;
                 pBpChunk->idChunk   = idChunk;
@@ -592 +593 @@
             }
 
-            RTMemFree((void *)pbmAlloc);
+            RTMemFree(pbmAlloc);
         }
         else
@@ -782 +783 @@
     {
         /* Allocate the bitmap first so we can skip calling into VMMR0 if it fails. */
-        AssertCompile(!(DBGF_BP_L2_TBL_ENTRIES_PER_CHUNK % 8));
-        volatile void *pbmAlloc = RTMemAllocZ(DBGF_BP_L2_TBL_ENTRIES_PER_CHUNK / 8);
+        AssertCompile(!(DBGF_BP_L2_TBL_ENTRIES_PER_CHUNK % 64));
+        void *pbmAlloc = RTMemAllocZ(DBGF_BP_L2_TBL_ENTRIES_PER_CHUNK / 8);
         if (RT_LIKELY(pbmAlloc))
         {
@@ -796 +797 @@
             {
                 pL2Chunk->pL2BaseR3 = (PDBGFBPL2ENTRY)Req.pChunkBaseR3;
-                pL2Chunk->pbmAlloc  = pbmAlloc;
+                pL2Chunk->pbmAlloc  = (void volatile *)pbmAlloc;
                 pL2Chunk->cFree     = DBGF_BP_L2_TBL_ENTRIES_PER_CHUNK;
                 pL2Chunk->idChunk   = idChunk;
@@ -802 +803 @@
             }
 
-            RTMemFree((void *)pbmAlloc);
+            RTMemFree(pbmAlloc);
         }
         else