Changeset 99070 in vbox for trunk

Timestamp:

Mar 20, 2023 2:58:57 PM (21 months ago)

Author:

vboxsync

Message:

VMM/{CPUM,DBGF}: Some basic support to dump register values with DBGF for ARMv8, bugref:10393

Location:

trunk

Files:

• include/VBox/vmm/dbgf.h (modified) (1 diff)
• src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• src/VBox/VMM/VMMR3/CPUM-armv8.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/CPUMDbg-armv8.cpp (added)
• src/VBox/VMM/VMMR3/DBGFReg.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp (modified) (2 diffs)
• src/VBox/VMM/include/CPUMInternal-armv8.h (modified) (1 diff)

trunk/include/VBox/vmm/dbgf.h

@@ -2038 +2038 @@
     DBGFREG_IDTR,
 
+    /** The end of the x86 registers. */
+    DBGFREG_X86_END = DBGFREG_IDTR,
+
+    /** @name ARMv8 register identifiers.
+     * @{ */
+    DBGFREG_ARMV8_FIRST,
+    /** General purpose registers. */
+    DBGFREG_ARMV8_GREG_X0,
+    DBGFREG_ARMV8_GREG_W0 = DBGFREG_ARMV8_GREG_X0,
+    DBGFREG_ARMV8_GREG_X1,
+    DBGFREG_ARMV8_GREG_W1 = DBGFREG_ARMV8_GREG_X1,
+    DBGFREG_ARMV8_GREG_X2,
+    DBGFREG_ARMV8_GREG_W2 = DBGFREG_ARMV8_GREG_X2,
+    DBGFREG_ARMV8_GREG_X3,
+    DBGFREG_ARMV8_GREG_W3 = DBGFREG_ARMV8_GREG_X3,
+    DBGFREG_ARMV8_GREG_X4,
+    DBGFREG_ARMV8_GREG_W4 = DBGFREG_ARMV8_GREG_X4,
+    DBGFREG_ARMV8_GREG_X5,
+    DBGFREG_ARMV8_GREG_W5 = DBGFREG_ARMV8_GREG_X5,
+    DBGFREG_ARMV8_GREG_X6,
+    DBGFREG_ARMV8_GREG_W6 = DBGFREG_ARMV8_GREG_X6,
+    DBGFREG_ARMV8_GREG_X7,
+    DBGFREG_ARMV8_GREG_W7 = DBGFREG_ARMV8_GREG_X7,
+    DBGFREG_ARMV8_GREG_X8,
+    DBGFREG_ARMV8_GREG_W8 = DBGFREG_ARMV8_GREG_X8,
+    DBGFREG_ARMV8_GREG_X9,
+    DBGFREG_ARMV8_GREG_W9 = DBGFREG_ARMV8_GREG_X9,
+    DBGFREG_ARMV8_GREG_X10,
+    DBGFREG_ARMV8_GREG_W10 = DBGFREG_ARMV8_GREG_X10,
+    DBGFREG_ARMV8_GREG_X11,
+    DBGFREG_ARMV8_GREG_W11 = DBGFREG_ARMV8_GREG_X11,
+    DBGFREG_ARMV8_GREG_X12,
+    DBGFREG_ARMV8_GREG_W12 = DBGFREG_ARMV8_GREG_X12,
+    DBGFREG_ARMV8_GREG_X13,
+    DBGFREG_ARMV8_GREG_W13 = DBGFREG_ARMV8_GREG_X13,
+    DBGFREG_ARMV8_GREG_X14,
+    DBGFREG_ARMV8_GREG_W14 = DBGFREG_ARMV8_GREG_X14,
+    DBGFREG_ARMV8_GREG_X15,
+    DBGFREG_ARMV8_GREG_W15 = DBGFREG_ARMV8_GREG_X15,
+    DBGFREG_ARMV8_GREG_X16,
+    DBGFREG_ARMV8_GREG_W16 = DBGFREG_ARMV8_GREG_X16,
+    DBGFREG_ARMV8_GREG_X17,
+    DBGFREG_ARMV8_GREG_W17 = DBGFREG_ARMV8_GREG_X17,
+    DBGFREG_ARMV8_GREG_X18,
+    DBGFREG_ARMV8_GREG_W18 = DBGFREG_ARMV8_GREG_X18,
+    DBGFREG_ARMV8_GREG_X19,
+    DBGFREG_ARMV8_GREG_W19 = DBGFREG_ARMV8_GREG_X19,
+    DBGFREG_ARMV8_GREG_X20,
+    DBGFREG_ARMV8_GREG_W20 = DBGFREG_ARMV8_GREG_X20,
+    DBGFREG_ARMV8_GREG_X21,
+    DBGFREG_ARMV8_GREG_W21 = DBGFREG_ARMV8_GREG_X21,
+    DBGFREG_ARMV8_GREG_X22,
+    DBGFREG_ARMV8_GREG_W22 = DBGFREG_ARMV8_GREG_X22,
+    DBGFREG_ARMV8_GREG_X23,
+    DBGFREG_ARMV8_GREG_W23 = DBGFREG_ARMV8_GREG_X23,
+    DBGFREG_ARMV8_GREG_X24,
+    DBGFREG_ARMV8_GREG_W24 = DBGFREG_ARMV8_GREG_X24,
+    DBGFREG_ARMV8_GREG_X25,
+    DBGFREG_ARMV8_GREG_W25 = DBGFREG_ARMV8_GREG_X25,
+    DBGFREG_ARMV8_GREG_X26,
+    DBGFREG_ARMV8_GREG_W26 = DBGFREG_ARMV8_GREG_X26,
+    DBGFREG_ARMV8_GREG_X27,
+    DBGFREG_ARMV8_GREG_W27 = DBGFREG_ARMV8_GREG_X27,
+    DBGFREG_ARMV8_GREG_X28,
+    DBGFREG_ARMV8_GREG_W28 = DBGFREG_ARMV8_GREG_X28,
+
+    DBGFREG_ARMV8_GREG_X29,
+    DBGFREG_ARMV8_GREG_W29 = DBGFREG_ARMV8_GREG_X29,
+    DBGFREG_ARMV8_GREG_FP = DBGFREG_ARMV8_GREG_X29,
+
+    DBGFREG_ARMV8_GREG_X30,
+    DBGFREG_ARMV8_GREG_W30 = DBGFREG_ARMV8_GREG_X30,
+    DBGFREG_ARMV8_GREG_LR = DBGFREG_ARMV8_GREG_X30,
+
+    DBGFREG_ARMV8_PC,
+
+    DBGFREG_ARMV8_VREG_V0,
+    DBGFREG_ARMV8_VREG_V1,
+    DBGFREG_ARMV8_VREG_V2,
+    DBGFREG_ARMV8_VREG_V3,
+    DBGFREG_ARMV8_VREG_V4,
+    DBGFREG_ARMV8_VREG_V5,
+    DBGFREG_ARMV8_VREG_V6,
+    DBGFREG_ARMV8_VREG_V7,
+    DBGFREG_ARMV8_VREG_V8,
+    DBGFREG_ARMV8_VREG_V9,
+    DBGFREG_ARMV8_VREG_V10,
+    DBGFREG_ARMV8_VREG_V11,
+    DBGFREG_ARMV8_VREG_V12,
+    DBGFREG_ARMV8_VREG_V13,
+    DBGFREG_ARMV8_VREG_V14,
+    DBGFREG_ARMV8_VREG_V15,
+    DBGFREG_ARMV8_VREG_V16,
+    DBGFREG_ARMV8_VREG_V17,
+    DBGFREG_ARMV8_VREG_V18,
+    DBGFREG_ARMV8_VREG_V19,
+    DBGFREG_ARMV8_VREG_V20,
+    DBGFREG_ARMV8_VREG_V21,
+    DBGFREG_ARMV8_VREG_V22,
+    DBGFREG_ARMV8_VREG_V23,
+    DBGFREG_ARMV8_VREG_V24,
+    DBGFREG_ARMV8_VREG_V25,
+    DBGFREG_ARMV8_VREG_V26,
+    DBGFREG_ARMV8_VREG_V27,
+    DBGFREG_ARMV8_VREG_V28,
+    DBGFREG_ARMV8_VREG_V29,
+    DBGFREG_ARMV8_VREG_V30,
+    DBGFREG_ARMV8_VREG_V31,
+
+    DBGFREG_ARMV8_FPCR,
+    DBGFREG_ARMV8_FPSR,
+
+    /** System registers: */
+    DBGFREG_ARMV8_SP_EL0,
+    DBGFREG_ARMV8_SP_EL1,
+    DBGFREG_ARMV8_SPSR_EL1,
+    DBGFREG_ARMV8_SPSR_EL2,
+    DBGFREG_ARMV8_PSTATE = DBGFREG_ARMV8_SPSR_EL2,
+    DBGFREG_ARMV8_ELR_EL1,
+
+    DBGFREG_ARMV8_LAST = DBGFREG_ARMV8_ELR_EL1,
+    /** @} */
+
     /** The end of the registers.  */
     DBGFREG_END,

trunk/src/VBox/VMM/Makefile.kmk

@@ -349 +349 @@
         VMMR3/CFGM.cpp \
         VMMR3/CPUM-armv8.cpp \
+        VMMR3/CPUMDbg-armv8.cpp \
         VMMR3/DBGF.cpp \
         VMMR3/DBGFAddr.cpp \

trunk/src/VBox/VMM/VMMR3/CPUM-armv8.cpp

@@ -185 +185 @@
 
 /**
- * Initializes the debug aids of CPUM.
- *
- * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
- */
-static int cpumR3DbgInit(PVM pVM)
-{
-    RT_NOREF(pVM);
-    /** @todo */
-    return VINF_SUCCESS;
-}
-
-
-/**
  * Initializes the CPUM.
  *

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

@@ -305 +305 @@
 
         if (enmType == DBGFREGSETTYPE_CPU)
+#if defined(VBOX_VMM_TARGET_ARMV8)
+            /** @todo This needs a general solution to avoid architecture dependent stuff here. */
+            AssertMsgReturn(iDesc < (unsigned)DBGFREG_END,
+                            ("%d iDesc=%d\n", paRegisters[iDesc].enmReg, iDesc),
+                            VERR_INVALID_PARAMETER);
+#else
             AssertMsgReturn(iDesc < (unsigned)DBGFREG_END && (unsigned)paRegisters[iDesc].enmReg == iDesc,
                             ("%d iDesc=%d\n", paRegisters[iDesc].enmReg, iDesc),
                             VERR_INVALID_PARAMETER);
+#endif
         else
             AssertReturn(paRegisters[iDesc].enmReg == DBGFREG_END, VERR_INVALID_PARAMETER);

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

@@ -338 +338 @@
     if (LogIs3Enabled())
     {
-#if 0
         char szRegs[4096];
         DBGFR3RegPrintf(pVM->pUVM, pVCpu->idCpu, &szRegs[0], sizeof(szRegs),
-                        "rax=%016VR{rax} rbx=%016VR{rbx} rcx=%016VR{rcx} rdx=%016VR{rdx}\n"
-                        "rsi=%016VR{rsi} rdi=%016VR{rdi} r8 =%016VR{r8} r9 =%016VR{r9}\n"
-                        "r10=%016VR{r10} r11=%016VR{r11} r12=%016VR{r12} r13=%016VR{r13}\n"
-                        "r14=%016VR{r14} r15=%016VR{r15} %VRF{rflags}\n"
-                        "rip=%016VR{rip} rsp=%016VR{rsp} rbp=%016VR{rbp}\n"
-                        "cs={%04VR{cs} base=%016VR{cs_base} limit=%08VR{cs_lim} flags=%04VR{cs_attr}} cr0=%016VR{cr0}\n"
-                        "ds={%04VR{ds} base=%016VR{ds_base} limit=%08VR{ds_lim} flags=%04VR{ds_attr}} cr2=%016VR{cr2}\n"
-                        "es={%04VR{es} base=%016VR{es_base} limit=%08VR{es_lim} flags=%04VR{es_attr}} cr3=%016VR{cr3}\n"
-                        "fs={%04VR{fs} base=%016VR{fs_base} limit=%08VR{fs_lim} flags=%04VR{fs_attr}} cr4=%016VR{cr4}\n"
-                        "gs={%04VR{gs} base=%016VR{gs_base} limit=%08VR{gs_lim} flags=%04VR{gs_attr}} cr8=%016VR{cr8}\n"
-                        "ss={%04VR{ss} base=%016VR{ss_base} limit=%08VR{ss_lim} flags=%04VR{ss_attr}}\n"
-                        "dr0=%016VR{dr0} dr1=%016VR{dr1} dr2=%016VR{dr2} dr3=%016VR{dr3}\n"
-                        "dr6=%016VR{dr6} dr7=%016VR{dr7}\n"
-                        "gdtr=%016VR{gdtr_base}:%04VR{gdtr_lim}  idtr=%016VR{idtr_base}:%04VR{idtr_lim}  rflags=%08VR{rflags}\n"
-                        "ldtr={%04VR{ldtr} base=%016VR{ldtr_base} limit=%08VR{ldtr_lim} flags=%08VR{ldtr_attr}}\n"
-                        "tr  ={%04VR{tr} base=%016VR{tr_base} limit=%08VR{tr_lim} flags=%08VR{tr_attr}}\n"
-                        "    sysenter={cs=%04VR{sysenter_cs} eip=%08VR{sysenter_eip} esp=%08VR{sysenter_esp}}\n"
-                        "        efer=%016VR{efer}\n"
-                        "         pat=%016VR{pat}\n"
-                        "     sf_mask=%016VR{sf_mask}\n"
-                        "krnl_gs_base=%016VR{krnl_gs_base}\n"
-                        "       lstar=%016VR{lstar}\n"
-                        "        star=%016VR{star} cstar=%016VR{cstar}\n"
-                        "fcw=%04VR{fcw} fsw=%04VR{fsw} ftw=%04VR{ftw} mxcsr=%04VR{mxcsr} mxcsr_mask=%04VR{mxcsr_mask}\n"
+                        "x0=%016VR{x0} x1=%016VR{x1} x2=%016VR{x2} x3=%016VR{x3}\n"
+                        "x4=%016VR{x4} x5=%016VR{x5} x6=%016VR{x6} x7=%016VR{x7}\n"
+                        "x8=%016VR{x8} x9=%016VR{x9} x10=%016VR{x10} x11=%016VR{x11}\n"
+                        "x12=%016VR{x12} x13=%016VR{x13} x14=%016VR{x14} x15=%016VR{x15}\n"
+                        "x16=%016VR{x16} x17=%016VR{x17} x18=%016VR{x18} x19=%016VR{x19}\n"
+                        "x20=%016VR{x20} x21=%016VR{x21} x22=%016VR{x22} x23=%016VR{x23}\n"
+                        "x24=%016VR{x24} x25=%016VR{x25} x26=%016VR{x26} x27=%016VR{x27}\n"
+                        "x28=%016VR{x28} x29=%016VR{x29} x30=%016VR{x30}\n"
+                        "pc=%016VR{pc} pstate=%016VR{pstate}\n"
+                        "sp_el0=%016VR{sp_el0} sp_el1=%016VR{sp_el1} elr_el1=%016VR{elr_el1}\n"
                         );
-
-        char szInstr[256];
+        char szInstr[256]; RT_ZERO(szInstr);
+#if 0
         DBGFR3DisasInstrEx(pVM->pUVM, pVCpu->idCpu, 0, 0,
                            DBGF_DISAS_FLAGS_CURRENT_GUEST | DBGF_DISAS_FLAGS_DEFAULT_MODE,
                            szInstr, sizeof(szInstr), NULL);
+#endif
         Log3(("%s%s\n", szRegs, szInstr));
-#else
-        RT_NOREF(pVM, pVCpu);
-#endif
     }
 }
@@ -832 +815 @@
         return rc;
 
+#ifdef LOG_ENABLED
+    if (LogIs3Enabled())
+        nemR3DarwinLogState(pVM, pVCpu);
+#endif
+
     hv_vcpu_exit_t *pExit = pVCpu->nem.s.pHvExit;
     switch (pExit->reason)

trunk/src/VBox/VMM/include/CPUMInternal-armv8.h

@@ -123 +123 @@
 RT_C_DECLS_BEGIN
 
+# ifdef IN_RING3
+DECLHIDDEN(int)       cpumR3DbgInit(PVM pVM);
+# endif
+
 RT_C_DECLS_END
 #endif /* !VBOX_FOR_DTRACE_LIB */