Changeset 97229 in vbox for trunk/src/VBox

Timestamp:

Oct 18, 2022 10:59:32 PM (2 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/VMM/VMMR0/HMR0.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/VMMR0/HMR0.cpp

@@ -1831 +1831 @@
     char *psz = szEFlags;
     PCCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
-    uint32_t uEFlags = pCtx->eflags.u32;
+    uint32_t fEFlags = pCtx->eflags.u;
     for (unsigned i = 0; i < RT_ELEMENTS(s_aFlags); i++)
     {
-        const char *pszAdd = s_aFlags[i].fFlag & uEFlags ? s_aFlags[i].pszSet : s_aFlags[i].pszClear;
+        const char *pszAdd = s_aFlags[i].fFlag & fEFlags ? s_aFlags[i].pszSet : s_aFlags[i].pszClear;
         if (pszAdd)
         {
@@ -1850 +1850 @@
          */
         if (CPUMIsGuestIn64BitCode(pVCpu))
-        {
             Log(("rax=%016RX64 rbx=%016RX64 rcx=%016RX64 rdx=%016RX64\n"
                  "rsi=%016RX64 rdi=%016RX64 r8 =%016RX64 r9 =%016RX64\n"
@@ -1873 +1872 @@
                  pCtx->r8, pCtx->r9, pCtx->r10, pCtx->r11, pCtx->r12, pCtx->r13,
                  pCtx->r14, pCtx->r15,
-                 pCtx->rip, pCtx->rsp, pCtx->rbp, X86_EFL_GET_IOPL(uEFlags), 31, szEFlags,
+                 pCtx->rip, pCtx->rsp, pCtx->rbp, X86_EFL_GET_IOPL(fEFlags), 31, szEFlags,
                  pCtx->cs.Sel, pCtx->cs.u64Base, pCtx->cs.u32Limit, pCtx->cs.Attr.u,
                  pCtx->ds.Sel, pCtx->ds.u64Base, pCtx->ds.u32Limit, pCtx->ds.Attr.u,
@@ -1883 +1882 @@
                  pCtx->dr[0],  pCtx->dr[1], pCtx->dr[2],  pCtx->dr[3],
                  pCtx->dr[4],  pCtx->dr[5], pCtx->dr[6],  pCtx->dr[7],
-                 pCtx->gdtr.pGdt, pCtx->gdtr.cbGdt, pCtx->idtr.pIdt, pCtx->idtr.cbIdt, uEFlags,
+                 pCtx->gdtr.pGdt, pCtx->gdtr.cbGdt, pCtx->idtr.pIdt, pCtx->idtr.cbIdt, fEFlags,
                  pCtx->ldtr.Sel, pCtx->ldtr.u64Base, pCtx->ldtr.u32Limit, pCtx->ldtr.Attr.u,
                  pCtx->tr.Sel, pCtx->tr.u64Base, pCtx->tr.u32Limit, pCtx->tr.Attr.u,
                  pCtx->SysEnter.cs, pCtx->SysEnter.eip, pCtx->SysEnter.esp));
-        }
         else
             Log(("eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n"
@@ -1903 +1901 @@
                  ,
                  pCtx->eax, pCtx->ebx, pCtx->ecx, pCtx->edx, pCtx->esi, pCtx->edi,
-                 pCtx->eip, pCtx->esp, pCtx->ebp, X86_EFL_GET_IOPL(uEFlags), 31, szEFlags,
+                 pCtx->eip, pCtx->esp, pCtx->ebp, X86_EFL_GET_IOPL(fEFlags), 31, szEFlags,
                  pCtx->cs.Sel, pCtx->cs.u64Base, pCtx->cs.u32Limit, pCtx->cs.Attr.u, pCtx->dr[0],  pCtx->dr[1],
                  pCtx->ds.Sel, pCtx->ds.u64Base, pCtx->ds.u32Limit, pCtx->ds.Attr.u, pCtx->dr[2],  pCtx->dr[3],
@@ -1910 +1908 @@
                  pCtx->gs.Sel, pCtx->gs.u64Base, pCtx->gs.u32Limit, pCtx->gs.Attr.u, pCtx->cr0,  pCtx->cr2,
                  pCtx->ss.Sel, pCtx->ss.u64Base, pCtx->ss.u32Limit, pCtx->ss.Attr.u, pCtx->cr3,  pCtx->cr4,
-                 pCtx->gdtr.pGdt, pCtx->gdtr.cbGdt, pCtx->idtr.pIdt, pCtx->idtr.cbIdt, uEFlags,
+                 pCtx->gdtr.pGdt, pCtx->gdtr.cbGdt, pCtx->idtr.pIdt, pCtx->idtr.cbIdt, fEFlags,
                  pCtx->ldtr.Sel, pCtx->ldtr.u64Base, pCtx->ldtr.u32Limit, pCtx->ldtr.Attr.u,
                  pCtx->tr.Sel, pCtx->tr.u64Base, pCtx->tr.u32Limit, pCtx->tr.Attr.u,
@@ -1932 +1930 @@
 
     if (fFlags & HM_DUMP_REG_FLAGS_MSRS)
-    {
         Log(("MSR:\n"
             "EFER         =%016RX64\n"
@@ -1948 +1945 @@
             pCtx->msrSFMASK,
             pCtx->msrKERNELGSBASE));
-    }
 }