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

Timestamp:

Oct 28, 2024 12:07:28 PM (3 months ago)

Author:

vboxsync

Message:

VMM/ARM: Treat DISOPTYPE_INTERRUPT insutrctions (like svc, hvc, ...) as call instructions, bugref:10393

File:

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

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

@@ -251 +251 @@
  * @returns Flag whether the given instruction is a call.
  * @param   uOpc        The opcode value from the disassembler.
- */
-DECL_FORCE_INLINE(bool) dbgfR3FlowDisOpcIsCall(uint16_t uOpc)
+ * @param   fOpType     The opcode type flags for the given opcode.
+ */
+DECL_FORCE_INLINE(bool) dbgfR3FlowDisOpcIsCall(uint16_t uOpc, uint32_t fOpType)
 {
 #ifdef VBOX_VMM_TARGET_ARMV8
@@ -263 +264 @@
         return true;
 
+    /* Treat instructions like svc/hvc as calls. */
+    if (fOpType & DISOPTYPE_INTERRUPT)
+        return true;
+
     return false;
 #else
+    RT_NOREF(fOpType);
     return uOpc == OP_CALL;
 #endif
@@ -1318 +1324 @@
                     uint16_t uOpc = DisState.pCurInstr->uOpcode;
 
-                    if (dbgfR3FlowDisOpcIsCall(uOpc))
+                    if (dbgfR3FlowDisOpcIsCall(uOpc, DisState.pCurInstr->fOpType))
                         pThis->cCallInsns++;
 
@@ -1369 +1375 @@
                         }
                     }
-                    else if (!dbgfR3FlowDisOpcIsCall(uOpc))
+                    else if (!dbgfR3FlowDisOpcIsCall(uOpc, DisState.pCurInstr->fOpType))
                     {
                         Assert(DisState.pCurInstr->fOpType & DISOPTYPE_COND_CONTROLFLOW);
@@ -1427 +1433 @@
 
                     /* Quit disassembling. */
-                    if (   (   !dbgfR3FlowDisOpcIsCall(uOpc)
+                    if (   (   !dbgfR3FlowDisOpcIsCall(uOpc, DisState.pCurInstr->fOpType)
                             || (pThis->fFlags & DBGF_FLOW_CREATE_F_CALL_INSN_SEPARATE_BB))
                         || RT_FAILURE(rc))