Changeset 106743 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 28, 2024 11:43:04 AM (4 months ago)

Author:

vboxsync

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

165627

Message:

VMM/ARM: Make the control flow graph generator work with ARMv8 A64 to some extent, bugref:10393

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (1 diff)
• VMMR3/DBGFDisas.cpp (modified) (1 diff)
• VMMR3/DBGFR3Flow.cpp (modified) (5 diffs)
• VMMR3/NEMR3Native-darwin-armv8.cpp (modified) (1 diff)
• include/DBGFInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/Makefile.kmk

@@ -388 +388 @@
  VBoxVMMArm_SONAME.linux = VBoxVMMArm.so
 
- VBoxVMMArm_DEFS     = VBOX_VMM_TARGET_ARMV8 VBOX_IN_VMM IN_VMM_R3 IN_DIS IN_DBG IN_GMM_R3 \
+ VBoxVMMArm_DEFS     = VBOX_VMM_TARGET_ARMV8 VBOX_DIS_WITH_ARMV8 VBOX_IN_VMM IN_VMM_R3 IN_DIS IN_DBG IN_GMM_R3 \
         $(filter-out VBOX_WITH_IEM_RECOMPILER VBOX_WITH_IEM_NATIVE_RECOMPILER,$(VMM_COMMON_DEFS))
  ifdef VBOX_WITH_VUSB

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

@@ -651 +651 @@
         pDisState->Param3    = State.Dis.aParams[2];
         pDisState->Param4    = State.Dis.aParams[3];
+#if defined(VBOX_VMM_TARGET_ARMV8)
+        memcpy(&pDisState->armv8, &State.Dis.armv8, sizeof(State.Dis.armv8));
+#else
+        memcpy(&pDisState->x86, &State.Dis.x86, sizeof(State.Dis.x86));
+#endif
     }
 

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

@@ -213 +213 @@
 
 /**
+ * Returns whether the given opcode and disassembler state denote an unconditional jump instruction.
+ *
+ * @returns Flag whether the given instruction is an unconditional jump.
+ * @param   uOpc        The opcode value from the disassembler.
+ * @param   pDis        The disassembler state.
+ */
+DECL_FORCE_INLINE(bool) dbgfR3FlowDisOpcIsUncondJmp(uint16_t uOpc, PDBGFDISSTATE pDis)
+{
+#ifdef VBOX_VMM_TARGET_ARMV8
+    if (   uOpc == OP_ARMV8_A64_BR
+        || uOpc == OP_ARMV8_A64_BRAAZ
+        || uOpc == OP_ARMV8_A64_BRABZ
+        || uOpc == OP_ARMV8_A64_BRAA
+        || uOpc == OP_ARMV8_A64_BRAB)
+        return true;
+
+    /* B and BC are special because only the al condition is unconditional. */
+    if (   uOpc == OP_ARMV8_A64_B
+        || uOpc == OP_ARMV8_A64_BC)
+    {
+        return    pDis->armv8.enmCond == kDisArmv8InstrCond_Al
+               || pDis->armv8.enmCond == kDisArmv8InstrCond_Al1;
+    }
+
+    return false;
+#else
+    RT_NOREF(pDis);
+
+    return uOpc == OP_JMP;
+#endif
+}
+
+
+/**
+ * Returns whether the given opcode denotes a call/branch and link instruction.
+ *
+ * @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)
+{
+#ifdef VBOX_VMM_TARGET_ARMV8
+    if (   uOpc == OP_ARMV8_A64_BL
+        || uOpc == OP_ARMV8_A64_BLR
+        || uOpc == OP_ARMV8_A64_BLRAA
+        || uOpc == OP_ARMV8_A64_BLRAB
+        || uOpc == OP_ARMV8_A64_BLRAAZ
+        || uOpc == OP_ARMV8_A64_BLRABZ)
+        return true;
+
+    return false;
+#else
+    return uOpc == OP_CALL;
+#endif
+}
+
+
+/**
+ * Returns whether the given opcode denotes a function/exception return.
+ *
+ * @returns Flag whether the given instruction is a return.
+ * @param   uOpc        The opcode value from the disassembler.
+ */
+DECL_FORCE_INLINE(bool) dbgfR3FlowDisOpcIsExit(uint16_t uOpc)
+{
+#ifdef VBOX_VMM_TARGET_ARMV8
+    if (   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_RETF
+        || uOpc == OP_IRET
+        || uOpc == OP_SYSEXIT
+        || uOpc == OP_SYSRET)
+        return true;
+
+    return false;
+#endif
+}
+
+
+/**
  * Checks whether both addresses are equal.
  *
@@ -1229 +1318 @@
                     uint16_t uOpc = DisState.pCurInstr->uOpcode;
 
-                    if (uOpc == OP_CALL)
+                    if (dbgfR3FlowDisOpcIsCall(uOpc))
                         pThis->cCallInsns++;
 
-                    if (   uOpc == OP_RETN || uOpc == OP_RETF || uOpc == OP_IRET
-                        || uOpc == OP_SYSEXIT || uOpc == OP_SYSRET)
+                    if (dbgfR3FlowDisOpcIsExit(uOpc))
                         pFlowBb->enmEndType = DBGFFLOWBBENDTYPE_EXIT;
-                    else if (uOpc == OP_JMP)
+                    else if (dbgfR3FlowDisOpcIsUncondJmp(uOpc, &DisState))
                     {
+#ifndef VBOX_VMM_TARGET_ARMV8 /* This is not true for B/BC on ARMv8 which can be both... */
                         Assert(DisState.pCurInstr->fOpType & DISOPTYPE_UNCOND_CONTROLFLOW);
+#endif
 
                         if (dbgfR3FlowBranchTargetIsIndirect(&DisState.Param1))
@@ -1279 +1369 @@
                         }
                     }
-                    else if (uOpc != OP_CALL)
+                    else if (!dbgfR3FlowDisOpcIsCall(uOpc))
                     {
                         Assert(DisState.pCurInstr->fOpType & DISOPTYPE_COND_CONTROLFLOW);
                         pFlowBb->enmEndType = DBGFFLOWBBENDTYPE_COND;
+
+#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. */
+#else
+                        PDISOPPARAM pParam = &DisState.Param1;
+#endif
 
                         /*
@@ -1293 +1393 @@
                         if (RT_SUCCESS(rc))
                         {
-                            rc = dbgfR3FlowQueryDirectBranchTarget(pUVM, idCpu, &DisState.Param1, &pInstr->AddrInstr, pInstr->cbInstr,
+                            rc = dbgfR3FlowQueryDirectBranchTarget(pUVM, idCpu, pParam, &pInstr->AddrInstr, pInstr->cbInstr,
                                                                    RT_BOOL(DisState.pCurInstr->fOpType & DISOPTYPE_RELATIVE_CONTROLFLOW),
                                                                    &pFlowBb->AddrTarget);
@@ -1327 +1427 @@
 
                     /* Quit disassembling. */
-                    if (   (   uOpc != OP_CALL
+                    if (   (   !dbgfR3FlowDisOpcIsCall(uOpc)
                             || (pThis->fFlags & DBGF_FLOW_CREATE_F_CALL_INSN_SEPARATE_BB))
                         || RT_FAILURE(rc))

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp

@@ -36 +36 @@
 #define LOG_GROUP LOG_GROUP_NEM
 #define VMCPU_INCL_CPUM_GST_CTX
-#define VBOX_DIS_WITH_ARMV8
-
 #include <VBox/vmm/nem.h>
 #include <VBox/vmm/iem.h>

trunk/src/VBox/VMM/include/DBGFInternal.h

@@ -1510 +1510 @@
     DISOPPARAM      Param3;
     DISOPPARAM      Param4;
+    /** Architecture specific state. */
+    RT_GCC_EXTENSION union
+    {
+        /** x86/AMD64 specific state. */
+        DIS_STATE_X86_T     x86;
+#if defined(VBOX_DIS_WITH_ARMV8)
+        /** ARMv8 specific state. */
+        DIS_STATE_ARMV8_T   armv8;
+#endif
+    };
 } DBGFDISSTATE;
 /** Pointer to a DBGF disassembler state. */