Changeset 107031 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Nov 18, 2024 3:00:29 PM (3 months ago)

Author:

vboxsync

Message:

VMM/CPUM-armv8: Allow reading/writing the debug control/value registers through CPUMQueryGuestSysReg/CPUMSetGuestSysReg, bugreef:10393

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllSysRegs-armv8.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllSysRegs-armv8.cpp

@@ -53 +53 @@
 #define CPUM_SYSREG_ASSERT_CPUMCPU_OFFSET_RETURN(a_pVCpu, a_pRange, a_Type, a_VarName) \
     AssertMsgReturn(   (a_pRange)->offCpumCpu >= 8 \
-                    && (a_pRange)->offCpumCpu < sizeof(CPUMCPU) \
+                    && (a_pRange)->offCpumCpu < sizeof(CPUMCTX) \
                     && !((a_pRange)->offCpumCpu & (RT_MIN(sizeof(a_Type), 8) - 1)) \
                     , ("offCpumCpu=%#x %s\n", (a_pRange)->offCpumCpu, (a_pRange)->szName), \
                     VERR_CPUM_MSR_BAD_CPUMCPU_OFFSET); \
-    a_Type *a_VarName = (a_Type *)((uintptr_t)&(a_pVCpu)->cpum.s + (a_pRange)->offCpumCpu)
+    a_Type *a_VarName = (a_Type *)((uintptr_t)&(a_pVCpu)->cpum.s.Guest + (a_pRange)->offCpumCpu)
 
 
@@ -146 +146 @@
 
 
+/** @callback_method_impl{FNCPUMRDSYSREG} */
+static DECLCALLBACK(VBOXSTRICTRC) cpumSysRegRd_ReadCpumOff(PVMCPUCC pVCpu, uint32_t idSysReg, PCCPUMSYSREGRANGE pRange, uint64_t *puValue)
+{
+    RT_NOREF(idSysReg);
+
+    CPUM_SYSREG_ASSERT_CPUMCPU_OFFSET_RETURN(pVCpu, pRange, CPUMCTXSYSREG, pSysReg);
+    *puValue = pSysReg->u64;
+    return VINF_SUCCESS;
+}
+
+
+/** @callback_method_impl{FNCPUMWRSYSREG} */
+static DECLCALLBACK(VBOXSTRICTRC) cpumSysRegWr_WriteCpumOff(PVMCPUCC pVCpu, uint32_t idSysReg, PCCPUMSYSREGRANGE pRange, uint64_t uValue, uint64_t uRawValue)
+{
+    RT_NOREF(idSysReg, uRawValue);
+
+    CPUM_SYSREG_ASSERT_CPUMCPU_OFFSET_RETURN(pVCpu, pRange, CPUMCTXSYSREG, pSysReg);
+    pSysReg->u64 = uValue;
+    return VINF_SUCCESS;
+}
+
 
 /** @callback_method_impl{FNCPUMRDSYSREG} */
@@ -209 +230 @@
     { NULL }, /* Alias */
     { cpumSysRegRd_WriteOnly },
+    { cpumSysRegRd_ReadCpumOff },
     { cpumSysRegRd_GicV3Icc  },
     { cpumSysRegRd_OslsrEl1  },
@@ -224 +246 @@
     { cpumSysRegWr_ReadOnly },
     { NULL }, /* Alias */
+    { cpumSysRegWr_WriteCpumOff },
     { cpumSysRegWr_GicV3Icc },
     { cpumSysRegWr_OslarEl1 },
@@ -468 +491 @@
     CPUM_ASSERT_RD_SYSREG_FN(FixedValue);
     CPUM_ASSERT_RD_SYSREG_FN(WriteOnly);
+    CPUM_ASSERT_RD_SYSREG_FN(ReadCpumOff);
     CPUM_ASSERT_RD_SYSREG_FN(GicV3Icc);
     CPUM_ASSERT_RD_SYSREG_FN(OslsrEl1);
+    CPUM_ASSERT_RD_SYSREG_FN(Pmu);
 
     AssertReturn(g_aCpumWrSysRegFns[kCpumSysRegWrFn_Invalid].pfnWrSysReg == NULL, VERR_CPUM_IPE_2);
     CPUM_ASSERT_WR_SYSREG_FN(IgnoreWrite);
     CPUM_ASSERT_WR_SYSREG_FN(ReadOnly);
+    CPUM_ASSERT_WR_SYSREG_FN(WriteCpumOff);
     CPUM_ASSERT_WR_SYSREG_FN(GicV3Icc);
     CPUM_ASSERT_WR_SYSREG_FN(OslarEl1);
+    CPUM_ASSERT_WR_SYSREG_FN(Pmu);
 
     return VINF_SUCCESS;