Changeset 107227 in vbox for trunk/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp

Timestamp:

Dec 4, 2024 3:20:14 PM (6 weeks ago)

Author:

vboxsync

Message:

VMM: Cleaning up ARMv8 / x86 split. jiraref:VBP-1470

File:

• trunk/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp (modified) (3 diffs)

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

@@ -329 +329 @@
 static void dbgfR3GetCoreCpu(PVMCPU pVCpu, PDBGFCORECPU pDbgfCpu)
 {
-#define DBGFCOPYSEL(a_dbgfsel, a_cpumselreg) \
+    PCCPUMCTX const pCtx = CPUMQueryGuestCtxPtr(pVCpu);
+
+#ifdef VBOX_VMM_TARGET_X86
+# define DBGFCOPYSEL(a_dbgfsel, a_cpumselreg) \
     do { \
         (a_dbgfsel).uBase  = (a_cpumselreg).u64Base; \
@@ -337 +340 @@
     } while (0)
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
-    AssertReleaseFailed();
-    RT_NOREF(pVCpu, pDbgfCpu);
-#else
-    PVM       pVM  = pVCpu->CTX_SUFF(pVM);
-    PCCPUMCTX pCtx = CPUMQueryGuestCtxPtr(pVCpu);
     pDbgfCpu->rax             = pCtx->rax;
     pDbgfCpu->rbx             = pCtx->rbx;
@@ -395 +392 @@
     pDbgfCpu->aXcr[1]         = pCtx->aXcr[1];
     AssertCompile(sizeof(pDbgfCpu->ext) == sizeof(pCtx->XState));
+
+    PVM const pVM  = pVCpu->CTX_SUFF(pVM);
     pDbgfCpu->cbExt = pVM->cpum.ro.GuestFeatures.cbMaxExtendedState;
     if (RT_LIKELY(pDbgfCpu->cbExt))
         memcpy(&pDbgfCpu->ext, &pCtx->XState, pDbgfCpu->cbExt);
+
+# undef DBGFCOPYSEL
+
+#elif defined(VBOX_VMM_TARGET_ARMV8)
+    RT_NOREF(pCtx, pDbgfCpu);
+    AssertReleaseFailed();
+
+#else
+# error "port me"
 #endif
-
-#undef DBGFCOPYSEL
 }