Changeset 92729 in vbox

Timestamp:

Dec 3, 2021 9:19:21 AM (3 years ago)

Author:

vboxsync

Message:

VMM/DBGF: nits

File:

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

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

@@ -1136 +1136 @@
 
             /* The L1 entry has changed due to another thread racing us during insertion, free nodes and try again. */
+            dbgfR3BpL2TblEntryFree(pUVM, idxL2Leaf, pL2Leaf);
             rc = VINF_TRY_AGAIN;
-            dbgfR3BpL2TblEntryFree(pUVM, idxL2Leaf, pL2Leaf);
         }
 
@@ -1172 +1172 @@
             /* Make a copy of the entry. */
             DBGFBPL2ENTRY L2Entry;
-            L2Entry.u64GCPtrKeyAndBpHnd1       = ASMAtomicReadU64((volatile uint64_t *)&pL2Entry->u64GCPtrKeyAndBpHnd1);
-            L2Entry.u64LeftRightIdxDepthBpHnd2 = ASMAtomicReadU64((volatile uint64_t *)&pL2Entry->u64LeftRightIdxDepthBpHnd2);
+            L2Entry.u64GCPtrKeyAndBpHnd1       = ASMAtomicReadU64(&pL2Entry->u64GCPtrKeyAndBpHnd1);
+            L2Entry.u64LeftRightIdxDepthBpHnd2 = ASMAtomicReadU64(&pL2Entry->u64LeftRightIdxDepthBpHnd2);
 
             RTGCUINTPTR GCPtrL2Entry = DBGF_BP_L2_ENTRY_GET_GCPTR(L2Entry.u64GCPtrKeyAndBpHnd1);
@@ -1179 +1179 @@
 
             /* Not found, get to the next level. */
-            uint32_t idxL2Next =   (GCPtr < GCPtrL2Entry)
-                                 ? DBGF_BP_L2_ENTRY_GET_IDX_LEFT(L2Entry.u64LeftRightIdxDepthBpHnd2)
-                                 : DBGF_BP_L2_ENTRY_GET_IDX_RIGHT(L2Entry.u64LeftRightIdxDepthBpHnd2);
+            uint32_t idxL2Next = GCPtr < GCPtrL2Entry
+                               ? DBGF_BP_L2_ENTRY_GET_IDX_LEFT(L2Entry.u64LeftRightIdxDepthBpHnd2)
+                               : DBGF_BP_L2_ENTRY_GET_IDX_RIGHT(L2Entry.u64LeftRightIdxDepthBpHnd2);
             if (idxL2Next == DBGF_BP_L2_ENTRY_IDX_END)
             {
@@ -1196 +1196 @@
         }
 
+        dbgfR3BpL2TblEntryFree(pUVM, idxL2Nd, pL2Nd);
         rc = VERR_DBGF_BP_L2_LOOKUP_FAILED;
-        dbgfR3BpL2TblEntryFree(pUVM, idxL2Nd, pL2Nd);
     }
 
@@ -1401 +1401 @@
             Assert(DBGF_BP_L2_ENTRY_GET_BP_HND(pL2Entry->u64GCPtrKeyAndBpHnd1, pL2Entry->u64LeftRightIdxDepthBpHnd2) == hBp); RT_NOREF(hBp);
 
-            rc = dbgfR3BpInt3BstNodeRemove(pUVM, idxL1, idxL2Root, idxL2Cur, pL2Entry,
-                                           idxL2Parent, pL2EntryParent, fLeftChild);
+            rc = dbgfR3BpInt3BstNodeRemove(pUVM, idxL1, idxL2Root, idxL2Cur, pL2Entry, idxL2Parent, pL2EntryParent, fLeftChild);
             break;
         }
@@ -1541 +1540 @@
                 }
             }
-
             break;
         }
@@ -1572 +1570 @@
 
                         /* Not found, get to the next level. */
-                        uint32_t idxL2Next =   (GCPtrKey < GCPtrL2Entry)
-                                             ? DBGF_BP_L2_ENTRY_GET_IDX_LEFT(pL2Nd->u64LeftRightIdxDepthBpHnd2)
-                                             : DBGF_BP_L2_ENTRY_GET_IDX_RIGHT(pL2Nd->u64LeftRightIdxDepthBpHnd2);
+                        uint32_t idxL2Next = GCPtrKey < GCPtrL2Entry
+                                           ? DBGF_BP_L2_ENTRY_GET_IDX_LEFT(pL2Nd->u64LeftRightIdxDepthBpHnd2)
+                                           : DBGF_BP_L2_ENTRY_GET_IDX_RIGHT(pL2Nd->u64LeftRightIdxDepthBpHnd2);
                         /* Address not found if the entry denotes the end. */
                         if (idxL2Next == DBGF_BP_L2_ENTRY_IDX_END)
@@ -1593 +1591 @@
     if (   hBp != NIL_DBGFBP
         && ppBp)
-        *ppBp =  dbgfR3BpGetByHnd(pUVM, hBp);
+        *ppBp = dbgfR3BpGetByHnd(pUVM, hBp);
     return hBp;
 }
@@ -1801 +1799 @@
 static int dbgfR3BpArm(PUVM pUVM, DBGFBP hBp, PDBGFBPINT pBp)
 {
-    int rc = VINF_SUCCESS;
+    int rc;
     PVM pVM = pUVM->pVM;
 
@@ -1855 +1853 @@
             ASMAtomicIncU32(&pUVM->dbgf.s.cPortIoBps);
             IOMR3NotifyBreakpointCountChange(pVM, true /*fPortIo*/, false /*fMmio*/);
+            rc = VINF_SUCCESS;
             break;
         }
@@ -1881 +1880 @@
 static int dbgfR3BpDisarm(PUVM pUVM, DBGFBP hBp, PDBGFBPINT pBp)
 {
-    int rc = VINF_SUCCESS;
+    int rc;
     PVM pVM = pUVM->pVM;
 
@@ -1930 +1929 @@
             if (!cPortIoBps) /** @todo Need to gather all EMTs to not have a stray EMT accessing BP data when it might go away. */
                 IOMR3NotifyBreakpointCountChange(pVM, false /*fPortIo*/, false /*fMmio*/);
+            rc = VINF_SUCCESS;
             break;
         }
@@ -1977 +1977 @@
                     /* Replace the int3 with the original instruction byte. */
                     abInstr[0] = pBp->Pub.u.Int3.bOrg;
-                    rcStrict = IEMExecOneWithPrefetchedByPC(pVCpu, CPUMCTX2CORE(&pVCpu->cpum.GstCtx), GCPtrInstr, &abInstr[0], sizeof(abInstr));
+                    rcStrict = IEMExecOneWithPrefetchedByPC(pVCpu, CPUMCTX2CORE(&pVCpu->cpum.GstCtx), GCPtrInstr,
+                                                            &abInstr[0], sizeof(abInstr));
                     if (   rcStrict == VINF_SUCCESS
                         && DBGF_BP_PUB_IS_EXEC_AFTER(&pBp->Pub))
                     {
-                        VBOXSTRICTRC rcStrict2 = pBpOwner->pfnBpHitR3(pVM, pVCpu->idCpu, pBp->pvUserR3, hBp, &pBp->Pub, DBGF_BP_F_HIT_EXEC_AFTER);
+                        VBOXSTRICTRC rcStrict2 = pBpOwner->pfnBpHitR3(pVM, pVCpu->idCpu, pBp->pvUserR3, hBp, &pBp->Pub,
+                                                                      DBGF_BP_F_HIT_EXEC_AFTER);
                         if (rcStrict2 == VINF_SUCCESS)
                             return VBOXSTRICTRC_VAL(rcStrict);
-                        else if (rcStrict2 != VINF_DBGF_BP_HALT)
+                        if (rcStrict2 != VINF_DBGF_BP_HALT)
                             return VERR_DBGF_BP_OWNER_CALLBACK_WRONG_STATUS;
                     }
@@ -2752 +2754 @@
                     return VINF_SUCCESS;
                 }
-                else if (VBOXSTRICTRC_VAL(rcStrict) != VINF_DBGF_BP_HALT) /* Guru meditation. */
+                if (VBOXSTRICTRC_VAL(rcStrict) != VINF_DBGF_BP_HALT) /* Guru meditation. */
                     return VERR_DBGF_BP_OWNER_CALLBACK_WRONG_STATUS;
                 /* else: Halt in the debugger. */