Changeset 100118 in vbox

Timestamp:

Jun 8, 2023 12:41:57 PM (21 months ago)

Author:

vboxsync

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

157811

Message:

VMM/CPUM: Include VBAR_EL1 register, bugref:10387 bugref:10390

Location:

trunk

Files:

• include/VBox/vmm/cpumctx-armv8.h (modified) (3 diffs)
• include/VBox/vmm/dbgf.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/CPUMDbg-armv8.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp (modified) (4 diffs)

trunk/include/VBox/vmm/cpumctx-armv8.h

@@ -147 +147 @@
     /** The TTBR1_EL1 register. */
     CPUMCTXSYSREG   Ttbr1;
+    /** The VBAR_EL1 register. */
+    CPUMCTXSYSREG   VBar;
 
     /** Floating point control register. */
@@ -170 +172 @@
     uint64_t        CntvCValEl0;
 
-    uint64_t        au64Padding2[7];
+    uint64_t        au64Padding2[6];
 } CPUMCTX;
 
@@ -231 +233 @@
 #define CPUMCTX_EXTRN_FPSR                      UINT64_C(0x0000000000008000)
 
+/** Various system registers (rarely accessed) are kept externally. */
+#define CPUMCTX_EXTRN_SYSREG                    UINT64_C(0x0000000000010000)
+
 /** Mask of bits the keepers can use for state tracking. */
 #define CPUMCTX_EXTRN_KEEPER_STATE_MASK         UINT64_C(0xffff000000000000)

trunk/include/VBox/vmm/dbgf.h

@@ -2161 +2161 @@
     DBGFREG_ARMV8_TTBR1_EL1,
     DBGFREG_ARMV8_ELR_EL1,
-
-    DBGFREG_ARMV8_LAST = DBGFREG_ARMV8_ELR_EL1,
+    DBGFREG_ARMV8_VBAR_EL1,
+
+    DBGFREG_ARMV8_LAST = DBGFREG_ARMV8_VBAR_EL1,
     /** @} */
 

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

@@ -280 +280 @@
     CPU_REG_RW_AS("ttbr1_el1",      TTBR1_EL1,      U64, Ttbr1,           cpumR3RegGet_Generic,         cpumR3RegSet_Generic,         NULL,                       NULL                    ),
     CPU_REG_RW_AS("elr_el1",        ELR_EL1,        U64, Elr,             cpumR3RegGet_Generic,         cpumR3RegSet_Generic,         NULL,                       NULL                    ),
+    CPU_REG_RW_AS("vbar_el1",       VBAR_EL1,       U64, VBar,            cpumR3RegGet_Generic,         cpumR3RegSet_Generic,         NULL,                       NULL                    ),
     CPU_REG_RW_AS("fpcr",           FPCR,           U64, fpcr,            cpumR3RegGet_Generic,         cpumR3RegSet_Generic,         NULL,                       NULL                    ),
     CPU_REG_RW_AS("fpsr",           FPSR,           U64, fpsr,            cpumR3RegGet_Generic,         cpumR3RegSet_Generic,         NULL,                       NULL                    ),

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

@@ -190 +190 @@
     { HV_SYS_REG_TTBR0_EL1, CPUMCTX_EXTRN_SCTLR_TCR_TTBR,   RT_UOFFSETOF(CPUMCTX, Ttbr0.u64)        },
     { HV_SYS_REG_TTBR1_EL1, CPUMCTX_EXTRN_SCTLR_TCR_TTBR,   RT_UOFFSETOF(CPUMCTX, Ttbr1.u64)        },
+    { HV_SYS_REG_VBAR_EL1,  CPUMCTX_EXTRN_SYSREG,           RT_UOFFSETOF(CPUMCTX, VBar.u64)         },
 };
 
@@ -432 +433 @@
                         "sctlr_el1=%016VR{sctlr_el1} tcr_el1=%016VR{tcr_el1}\n"
                         "ttbr0_el1=%016VR{ttbr0_el1} ttbr1_el1=%016VR{ttbr1_el1}\n"
+                        "vbar_el1=%016VR{vbar_el1}\n"
                         );
         char szInstr[256]; RT_ZERO(szInstr);
@@ -478 +480 @@
 
     if (   hrc == HV_SUCCESS
-        && (fWhat & (CPUMCTX_EXTRN_SPSR | CPUMCTX_EXTRN_ELR | CPUMCTX_EXTRN_SP | CPUMCTX_EXTRN_SCTLR_TCR_TTBR)))
+        && (fWhat & (CPUMCTX_EXTRN_SPSR | CPUMCTX_EXTRN_ELR | CPUMCTX_EXTRN_SP | CPUMCTX_EXTRN_SCTLR_TCR_TTBR | CPUMCTX_EXTRN_SYSREG)))
     {
         /* System registers. */
@@ -547 +549 @@
 
     if (   hrc == HV_SUCCESS
-        &&     (pVCpu->cpum.GstCtx.fExtrn & (CPUMCTX_EXTRN_SPSR | CPUMCTX_EXTRN_ELR | CPUMCTX_EXTRN_SP | CPUMCTX_EXTRN_SCTLR_TCR_TTBR))
-            !=                              (CPUMCTX_EXTRN_SPSR | CPUMCTX_EXTRN_ELR | CPUMCTX_EXTRN_SP | CPUMCTX_EXTRN_SCTLR_TCR_TTBR))
+        &&     (pVCpu->cpum.GstCtx.fExtrn & (CPUMCTX_EXTRN_SPSR | CPUMCTX_EXTRN_ELR | CPUMCTX_EXTRN_SP | CPUMCTX_EXTRN_SCTLR_TCR_TTBR | CPUMCTX_EXTRN_SYSREG))
+            !=                              (CPUMCTX_EXTRN_SPSR | CPUMCTX_EXTRN_ELR | CPUMCTX_EXTRN_SP | CPUMCTX_EXTRN_SCTLR_TCR_TTBR | CPUMCTX_EXTRN_SYSREG))
     {
         /* System registers. */