Changeset 97221 in vbox

Timestamp:

Oct 18, 2022 10:51:49 PM (3 years ago)

Author:

vboxsync

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

154197

Message:

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

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (5 diffs)

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

@@ -2242 +2242 @@
      * Clear the busy bit in current task's TSS descriptor if it's a task switch due to JMP/IRET.
      */
-    uint32_t u32EFlags = pVCpu->cpum.GstCtx.eflags.u32;
+    uint32_t fEFlags = pVCpu->cpum.GstCtx.eflags.u;
     if (   enmTaskSwitch == IEMTASKSWITCH_JUMP
         || enmTaskSwitch == IEMTASKSWITCH_IRET)
@@ -2270 +2270 @@
             Assert(   uNewTSSType == X86_SEL_TYPE_SYS_286_TSS_BUSY
                    || uNewTSSType == X86_SEL_TYPE_SYS_386_TSS_BUSY);
-            u32EFlags &= ~X86_EFL_NT;
+            fEFlags &= ~X86_EFL_NT;
         }
     }
@@ -2282 +2282 @@
         Log(("iemTaskSwitch: Switching to the same TSS! enmTaskSwitch=%u GCPtr[Cur|New]TSS=%#RGv\n", enmTaskSwitch, GCPtrCurTSS));
         Log(("uCurCr3=%#x uCurEip=%#x uCurEflags=%#x uCurEax=%#x uCurEsp=%#x uCurEbp=%#x uCurCS=%#04x uCurSS=%#04x uCurLdt=%#x\n",
-             pVCpu->cpum.GstCtx.cr3, pVCpu->cpum.GstCtx.eip, pVCpu->cpum.GstCtx.eflags.u32, pVCpu->cpum.GstCtx.eax,
+             pVCpu->cpum.GstCtx.cr3, pVCpu->cpum.GstCtx.eip, pVCpu->cpum.GstCtx.eflags.u, pVCpu->cpum.GstCtx.eax,
              pVCpu->cpum.GstCtx.esp, pVCpu->cpum.GstCtx.ebp, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.ss.Sel,
              pVCpu->cpum.GstCtx.ldtr.Sel));
@@ -2307 +2307 @@
         PX86TSS32 pCurTSS32 = (PX86TSS32)((uintptr_t)pvCurTSS32 - offCurTSS);
         pCurTSS32->eip    = uNextEip;
-        pCurTSS32->eflags = u32EFlags;
+        pCurTSS32->eflags = fEFlags;
         pCurTSS32->eax    = pVCpu->cpum.GstCtx.eax;
         pCurTSS32->ecx    = pVCpu->cpum.GstCtx.ecx;
@@ -2351 +2351 @@
         PX86TSS16 pCurTSS16 = (PX86TSS16)((uintptr_t)pvCurTSS16 - offCurTSS);
         pCurTSS16->ip    = uNextEip;
-        pCurTSS16->flags = u32EFlags;
+        pCurTSS16->flags = (uint16_t)fEFlags;
         pCurTSS16->ax    = pVCpu->cpum.GstCtx.ax;
         pCurTSS16->cx    = pVCpu->cpum.GstCtx.cx;