Changeset 107227 in vbox for trunk/src/VBox/VMM/VMMR3/DBGFR3Flow.cpp

Timestamp:

Dec 4, 2024 3:20:14 PM (6 weeks ago)

Author:

vboxsync

Message:

VMM: Cleaning up ARMv8 / x86 split. jiraref:VBP-1470

File:

• trunk/src/VBox/VMM/VMMR3/DBGFR3Flow.cpp (modified) (13 diffs)

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

@@ -232 +232 @@
     if (   uOpc == OP_ARMV8_A64_B
         || uOpc == OP_ARMV8_A64_BC)
-    {
-        return    pDis->armv8.enmCond == kDisArmv8InstrCond_Al
-               || pDis->armv8.enmCond == kDisArmv8InstrCond_Al1;
-    }
+        return pDis->armv8.enmCond == kDisArmv8InstrCond_Al
+            || pDis->armv8.enmCond == kDisArmv8InstrCond_Al1;
 
     return false;
+
+#elif defined(VBOX_VMM_TARGET_X86)
+    RT_NOREF_PV(pDis);
+    return uOpc == OP_JMP;
+
 #else
-    RT_NOREF(pDis);
-
-    return uOpc == OP_JMP;
+# error "port me"
 #endif
 }
@@ -269 +270 @@
 
     return false;
+
+#elif defined(VBOX_VMM_TARGET_X86)
+    RT_NOREF_PV(fOpType);
+    return uOpc == OP_CALL;
+
 #else
-    RT_NOREF(fOpType);
-    return uOpc == OP_CALL;
+# error "port me"
 #endif
 }
@@ -285 +290 @@
 {
 #ifdef VBOX_VMM_TARGET_ARMV8
-    if (   uOpc == OP_ARMV8_A64_RET
+    return uOpc == OP_ARMV8_A64_RET
         || uOpc == OP_ARMV8_A64_RETAA
         || uOpc == OP_ARMV8_A64_RETAB
         || uOpc == OP_ARMV8_A64_ERET
         || uOpc == OP_ARMV8_A64_ERETAA
-        || uOpc == OP_ARMV8_A64_ERETAB)
-        return true;
-
-    return false;
-#else
-    if (   uOpc == OP_RETN
+        || uOpc == OP_ARMV8_A64_ERETAB;
+
+#elif defined(VBOX_VMM_TARGET_X86)
+    return uOpc == OP_RETN
         || uOpc == OP_RETF
         || uOpc == OP_IRET
         || uOpc == OP_SYSEXIT
-        || uOpc == OP_SYSRET)
-        return true;
-
-    return false;
+        || uOpc == OP_SYSRET;
+
+#else
+# error "port me"
 #endif
 }
@@ -316 +319 @@
 static bool dbgfR3FlowAddrEqual(PDBGFADDRESS pAddr1, PDBGFADDRESS pAddr2)
 {
-    return    pAddr1->Sel == pAddr2->Sel
-           && pAddr1->off == pAddr2->off;
+    return pAddr1->Sel == pAddr2->Sel
+        && pAddr1->off == pAddr2->off;
 }
 
@@ -330 +333 @@
 static bool dbgfR3FlowAddrLower(PDBGFADDRESS pAddr1, PDBGFADDRESS pAddr2)
 {
-    return    pAddr1->Sel == pAddr2->Sel
-           && pAddr1->off < pAddr2->off;
+    return pAddr1->Sel == pAddr2->Sel
+        && pAddr1->off < pAddr2->off;
 }
 
@@ -344 +347 @@
 static bool dbgfR3FlowAddrIntersect(PDBGFFLOWBBINT pFlowBb, PDBGFADDRESS pAddr)
 {
-    return    (pFlowBb->AddrStart.Sel == pAddr->Sel)
-           && (pFlowBb->AddrStart.off <= pAddr->off)
-           && (pFlowBb->AddrEnd.off >= pAddr->off);
+    return pFlowBb->AddrStart.Sel == pAddr->Sel
+        && pFlowBb->AddrStart.off <= pAddr->off
+        && pFlowBb->AddrEnd.off   >= pAddr->off;
 }
 
@@ -363 +366 @@
         if (pAddr1->off >= pAddr2->off)
             return pAddr1->off - pAddr2->off;
-        else
-            return pAddr2->off - pAddr1->off;
-    }
-    else
-        AssertFailed();
-
+        return pAddr2->off - pAddr1->off;
+    }
+    AssertFailed();
     return 0;
 }
@@ -774 +774 @@
                                              uint32_t cbInstr, bool fRelJmp, PDBGFADDRESS pAddrJmpTarget)
 {
-    int rc = VINF_SUCCESS;
-
     Assert(!dbgfR3FlowBranchTargetIsIndirect(pDisParam));
 
-    /* Relative jumps are always from the beginning of the next instruction. */
     *pAddrJmpTarget = *pAddrInstr;
-#ifdef VBOX_VMM_TARGET_ARMV8
-    /* On ARM relative jumps are always from the beginning of the curent instruction (b #0 will jump to itself for instance). */
+#ifdef VBOX_VMM_TARGET_X86
+    /* Relative to the next instruction. */
+    DBGFR3AddrAdd(pAddrJmpTarget, cbInstr);
+#elif defined(VBOX_VMM_TARGET_ARMV8)
+    /* Relative to the start of the instruction. */
     RT_NOREF(cbInstr);
 #else
-    DBGFR3AddrAdd(pAddrJmpTarget, cbInstr);
+# error "port me"
 #endif
 
@@ -799 +799 @@
             iRel = (int64_t)pDisParam->uValue;
         else
-            AssertFailedStmt(rc = VERR_NOT_SUPPORTED);
+            AssertFailedReturn(VERR_NOT_SUPPORTED);
 
         if (iRel < 0)
@@ -816 +816 @@
         }
         else
-            AssertFailedStmt(rc = VERR_INVALID_STATE);
-    }
-
-    return rc;
+            AssertFailedReturn(VERR_INVALID_STATE);
+    }
+
+    return VINF_SUCCESS;
 }
 
@@ -1386 +1386 @@
 
 #ifdef VBOX_VMM_TARGET_ARMV8
-                        PDISOPPARAM pParam =   uOpc == OP_ARMV8_A64_B || uOpc == OP_ARMV8_A64_BC
-                                             ? &DisState.Param1
-                                             : uOpc == OP_ARMV8_A64_CBZ || uOpc == OP_ARMV8_A64_CBNZ
-                                             ? &DisState.Param2  /* cbz/cbnz. */
-                                             : &DisState.Param3; /* tbz/tbnz. */
+                        PDISOPPARAM pParam = uOpc == OP_ARMV8_A64_B || uOpc == OP_ARMV8_A64_BC
+                                           ? &DisState.Param1
+                                           : uOpc == OP_ARMV8_A64_CBZ || uOpc == OP_ARMV8_A64_CBNZ
+                                           ? &DisState.Param2  /* cbz/cbnz. */
+                                           : &DisState.Param3; /* tbz/tbnz. */
 #else
                         PDISOPPARAM pParam = &DisState.Param1;
@@ -1466 +1466 @@
 static int dbgfR3FlowPopulate(PUVM pUVM, VMCPUID idCpu, PDBGFFLOWINT pThis, uint32_t cbDisasmMax, uint32_t fFlags)
 {
-    int rc = VINF_SUCCESS;
     PDBGFFLOWBBINT pFlowBb = dbgfR3FlowGetUnpopulatedBb(pThis);
-
     while (pFlowBb != NULL)
     {
-        rc = dbgfR3FlowBbProcess(pUVM, idCpu, pThis, pFlowBb, cbDisasmMax, fFlags);
-        if (RT_FAILURE(rc))
-            break;
-
-        pFlowBb = dbgfR3FlowGetUnpopulatedBb(pThis);
-    }
-
-    return rc;
+        int rc = dbgfR3FlowBbProcess(pUVM, idCpu, pThis, pFlowBb, cbDisasmMax, fFlags);
+        if (RT_SUCCESS(rc))
+            pFlowBb = dbgfR3FlowGetUnpopulatedBb(pThis);
+        else
+            return rc;
+    }
+
+    return VINF_SUCCESS;
 }
 
@@ -1506 +1504 @@
 
     /* Create the control flow graph container. */
-    int rc = VINF_SUCCESS;
+    int rc;
     PDBGFFLOWINT pThis = (PDBGFFLOWINT)RTMemAllocZ(sizeof(DBGFFLOWINT));
     if (RT_LIKELY(pThis))