Changeset 108759 in vbox

Timestamp:

Mar 26, 2025 4:18:44 PM (3 weeks ago)

Author:

vboxsync

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

168186

Message:

VMM/Arm: Add ACTLR_EL1 to the CPU state, bugref:10392 [Windows build fix, our SDK is too old to know about WHvArm64RegisterActlrEl1]

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-win-armv8.cpp (modified) (4 diffs)

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

@@ -171 +171 @@
 
 #define My_WHvArm64RegisterGicrBaseGpa ((WHV_REGISTER_NAME)UINT32_C(0x00063000))
+#define My_WHvArm64RegisterActlrEl1    ((WHV_REGISTER_NAME)UINT32_C(0x00040003))
 
 
@@ -1412 +1413 @@
         ADD_SYSREG64(WHvArm64RegisterTpidrEl0,      pVCpu->cpum.GstCtx.aTpIdr[0]);
         ADD_SYSREG64(WHvArm64RegisterTpidrEl1,      pVCpu->cpum.GstCtx.aTpIdr[1]);
-        ADD_SYSREG64(WHvArm64RegisterActlrEl1,      pVCpu->cpum.GstCtx.Actlr);
+        ADD_SYSREG64(My_WHvArm64RegisterActlrEl1,   pVCpu->cpum.GstCtx.Actlr);
     }
 
@@ -1602 +1603 @@
         aenmNames[iReg++] = WHvArm64RegisterTpidrEl0;
         aenmNames[iReg++] = WHvArm64RegisterTpidrEl1;
-        aenmNames[iReg++] = WHvArm64RegisterActlrEl1;
+        aenmNames[iReg++] = My_WHvArm64RegisterActlrEl1;
     }
 
@@ -1800 +1801 @@
         GET_SYSREG64(pVCpu->cpum.GstCtx.aTpIdr[0],  WHvArm64RegisterTpidrEl0);
         GET_SYSREG64(pVCpu->cpum.GstCtx.aTpIdr[1],  WHvArm64RegisterTpidrEl1);
-        GET_SYSREG64(pVCpu->cpum.GstCtx.Actlr,      WHvArm64RegisterActlrEl1);
+        GET_SYSREG64(pVCpu->cpum.GstCtx.Actlr,      My_WHvArm64RegisterActlrEl1);
     }