Changeset 97218 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 18, 2022 10:49:14 PM (2 years ago)

Author:

vboxsync

Message:

VMM/SELM: Access CPUMCTX::eflags via the 'u' member when possible in preparation for putting internal info in the reserved bits.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• DBGFAllBp.cpp (modified) (1 diff)
• EMAll.cpp (modified) (1 diff)
• SELMAll.cpp (modified) (2 diffs)

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

@@ -551 +551 @@
     {
         RTGCPTR GCPtrBp;
-        int rc = SELMValidateAndConvertCSAddr(pVCpu, pCtx->eflags, pCtx->ss.Sel, pCtx->cs.Sel, &pCtx->cs,
+        int rc = SELMValidateAndConvertCSAddr(pVCpu, pCtx->eflags.u, pCtx->ss.Sel, pCtx->cs.Sel, &pCtx->cs,
                                               pCtx->rip /* no -1 outside non-rawmode */, &GCPtrBp);
         AssertRCReturn(rc, rc);

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

@@ -913 +913 @@
 #else
 /** @todo Get the CPU mode as well while we're at it! */
-    int rc = SELMValidateAndConvertCSAddr(pVCpu, pCtx->eflags, pCtx->ss.Sel, pCtx->cs.Sel, &pCtx->cs, pCtx->rip, &GCPtrInstr);
+    int rc = SELMValidateAndConvertCSAddr(pVCpu, pCtx->eflags.u, pCtx->ss.Sel, pCtx->cs.Sel, &pCtx->cs, pCtx->rip, &GCPtrInstr);
 #endif
     if (RT_SUCCESS(rc))

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

@@ -335 +335 @@
  * @returns VBox status code.
  * @param   pVCpu       The cross context virtual CPU structure.
- * @param   Efl         Current EFLAGS.
+ * @param   fEFlags     Current EFLAGS.
  * @param   SelCPL      Current privilege level.  Get this from SS - CS might be
  *                      conforming!  A full selector can be passed, we'll only
@@ -344 +344 @@
  * @param   ppvFlat     Where to store the flat address upon successful return.
  */
-VMMDECL(int) SELMValidateAndConvertCSAddr(PVMCPU pVCpu, X86EFLAGS Efl, RTSEL SelCPL, RTSEL SelCS, PCPUMSELREG pSRegCS,
+VMMDECL(int) SELMValidateAndConvertCSAddr(PVMCPU pVCpu, uint32_t fEFlags, RTSEL SelCPL, RTSEL SelCS, PCPUMSELREG pSRegCS,
                                           RTGCPTR Addr, PRTGCPTR ppvFlat)
 {
-    if (    Efl.Bits.u1VM
-        ||  CPUMIsGuestInRealMode(pVCpu))
+    if (   (fEFlags & X86_EFL_VM)
+        || CPUMIsGuestInRealMode(pVCpu))
         return selmValidateAndConvertCSAddrRealMode(pVCpu, SelCS, pSRegCS, Addr, ppvFlat);