Changeset 100940 in vbox

Timestamp:

Aug 22, 2023 2:29:29 PM (21 months ago)

Author:

vboxsync

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

158878

Message:

VMM: Make CPUMIsGuestIn64Bit[Code|CodeEx|Slow] use a const CPUM context parameter.

Location:

trunk

Files:

• include/VBox/vmm/cpum-armv8.h (modified) (1 diff)
• include/VBox/vmm/cpum-x86-amd64.h (modified) (2 diffs)
• include/VBox/vmm/cpum.h (modified) (1 diff)
• src/VBox/Debugger/testcase/tstDBGCStubs.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllRegs-armv8.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/CPUM.cpp (modified) (3 diffs)

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

@@ -275 +275 @@
  * @param   pCtx    Current CPU context.
  */
-DECLINLINE(bool) CPUMIsGuestIn64BitCodeEx(PCPUMCTX pCtx)
+DECLINLINE(bool) CPUMIsGuestIn64BitCodeEx(PCCPUMCTX pCtx)
 {
     return !RT_BOOL(pCtx->fPState & ARMV8_SPSR_EL2_AARCH64_M4);

trunk/include/VBox/vmm/cpum-x86-amd64.h

@@ -1503 +1503 @@
 }
 
-VMM_INT_DECL(bool) CPUMIsGuestIn64BitCodeSlow(PCPUMCTX pCtx);
+VMM_INT_DECL(bool) CPUMIsGuestIn64BitCodeSlow(PCCPUMCTX pCtx);
 
 /**
@@ -1511 +1511 @@
  * @param   pCtx    Current CPU context.
  */
-DECLINLINE(bool) CPUMIsGuestIn64BitCodeEx(PCPUMCTX pCtx)
+DECLINLINE(bool) CPUMIsGuestIn64BitCodeEx(PCCPUMCTX pCtx)
 {
     if (!(pCtx->msrEFER & MSR_K6_EFER_LMA))

trunk/include/VBox/vmm/cpum.h

@@ -382 +382 @@
 /** @name Misc Guest Predicate Functions.
  * @{  */
-VMMDECL(bool)           CPUMIsGuestIn64BitCode(PVMCPU pVCpu);
+VMMDECL(bool)           CPUMIsGuestIn64BitCode(PCVMCPU pVCpu);
 /** @} */
 

trunk/src/VBox/Debugger/testcase/tstDBGCStubs.cpp

@@ -789 +789 @@
 }
 
-VMMDECL(bool) CPUMIsGuestIn64BitCode(PVMCPU pVCpu)
+VMMDECL(bool) CPUMIsGuestIn64BitCode(PCVMCPU pVCpu)
 {
     return false;

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

@@ -237 +237 @@
  * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
  */
-VMMDECL(bool) CPUMIsGuestIn64BitCode(PVMCPU pVCpu)
+VMMDECL(bool) CPUMIsGuestIn64BitCode(PCVMCPU pVCpu)
 {
     CPUM_INT_ASSERT_NOT_EXTRN(pVCpu, CPUMCTX_EXTRN_PSTATE);
@@ -251 +251 @@
  * @param   pCtx        Pointer to the current guest CPU context.
  */
-VMM_INT_DECL(bool) CPUMIsGuestIn64BitCodeSlow(PCPUMCTX pCtx)
+VMM_INT_DECL(bool) CPUMIsGuestIn64BitCodeSlow(PCCPUMCTX pCtx)
 {
     return CPUMIsGuestIn64BitCode(CPUM_GUEST_CTX_TO_VMCPU(pCtx));

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -1596 +1596 @@
  * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
  */
-VMMDECL(bool) CPUMIsGuestIn64BitCode(PVMCPU pVCpu)
+VMMDECL(bool) CPUMIsGuestIn64BitCode(PCVMCPU pVCpu)
 {
     CPUM_INT_ASSERT_NOT_EXTRN(pVCpu, CPUMCTX_EXTRN_CS | CPUMCTX_EXTRN_EFER);
@@ -1613 +1613 @@
  * @param   pCtx        Pointer to the current guest CPU context.
  */
-VMM_INT_DECL(bool) CPUMIsGuestIn64BitCodeSlow(PCPUMCTX pCtx)
+VMM_INT_DECL(bool) CPUMIsGuestIn64BitCodeSlow(PCCPUMCTX pCtx)
 {
     return CPUMIsGuestIn64BitCode(CPUM_GUEST_CTX_TO_VMCPU(pCtx));

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

@@ -3217 +3217 @@
  * @param   pszPrefix   Register name prefix.
  */
-static void cpumR3InfoOne(PVM pVM, PVMCPU pVCpu, PCDBGFINFOHLP pHlp, CPUMDUMPTYPE enmType, const char *pszPrefix)
-{
-    PCPUMCTX pCtx = &pVCpu->cpum.s.Guest;
+static void cpumR3InfoOne(PVM pVM, PCVMCPU pVCpu, PCDBGFINFOHLP pHlp, CPUMDUMPTYPE enmType, const char *pszPrefix)
+{
+    PCCPUMCTX pCtx = &pVCpu->cpum.s.Guest;
 
     /*
@@ -3364 +3364 @@
                             pszPrefix, UINT64_C(0) /** @todo XSS */, pCtx->fXStateMask);
             {
-                PX86FXSTATE pFpuCtx = &pCtx->XState.x87;
+                PCX86FXSTATE pFpuCtx = &pCtx->XState.x87;
                 pHlp->pfnPrintf(pHlp,
                     "%sFCW=%04x %sFSW=%04x %sFTW=%04x %sFOP=%04x %sMXCSR=%08x %sMXCSR_MASK=%08x\n"
@@ -3664 +3664 @@
     cpumR3InfoParseArg(pszArgs, &enmType, &pszComment);
 
-    PVMCPU pVCpu = VMMGetCpu(pVM);
+    PCVMCPU pVCpu = VMMGetCpu(pVM);
     if (!pVCpu)
         pVCpu = pVM->apCpusR3[0];