Changeset 97222 in vbox for trunk/src

Timestamp:

Oct 18, 2022 10:52:41 PM (3 years ago)

Author:

vboxsync

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

154198

Message:

VMM/IEM: 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:

• IEMAllCImplSvmInstr.cpp (modified) (3 diffs)
• IEMAllCImplVmxInstr.cpp (modified) (1 diff)

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

@@ -215 +215 @@
             pVmcbMemState->u64CR0          = pVCpu->cpum.GstCtx.cr0;
             /** @todo Nested paging. */
-            pVmcbMemState->u64RFlags       = pVCpu->cpum.GstCtx.rflags.u64;
+            pVmcbMemState->u64RFlags       = pVCpu->cpum.GstCtx.rflags.u;
             pVmcbMemState->u64RIP          = pVCpu->cpum.GstCtx.rip;
             pVmcbMemState->u64RSP          = pVCpu->cpum.GstCtx.rsp;
@@ -795 +795 @@
         pVCpu->cpum.GstCtx.dr[6]      = pVmcbNstGst->u64DR6;
         pVCpu->cpum.GstCtx.dr[7]      = pVmcbNstGst->u64DR7;
-        pVCpu->cpum.GstCtx.rflags.u64 = pVmcbNstGst->u64RFlags;
+        pVCpu->cpum.GstCtx.rflags.u   = pVmcbNstGst->u64RFlags;
         pVCpu->cpum.GstCtx.rax        = pVmcbNstGst->u64RAX;
         pVCpu->cpum.GstCtx.rsp        = pVmcbNstGst->u64RSP;
@@ -913 +913 @@
             LogFlow(("iemSvmVmrun: Entering nested-guest: %04x:%08RX64 cr0=%#RX64 cr3=%#RX64 cr4=%#RX64 efer=%#RX64 efl=%#x\n",
                      pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.cr0, pVCpu->cpum.GstCtx.cr3,
-                     pVCpu->cpum.GstCtx.cr4, pVCpu->cpum.GstCtx.msrEFER, pVCpu->cpum.GstCtx.rflags.u64));
+                     pVCpu->cpum.GstCtx.cr4, pVCpu->cpum.GstCtx.msrEFER, pVCpu->cpum.GstCtx.eflags.u));
 
         LogFlow(("iemSvmVmrun: returns %d\n", VBOXSTRICTRC_VAL(rcStrict)));

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

@@ -2467 +2467 @@
     Log2(("vmexit: reason=%u qual=%#RX64 cs:rip=%04x:%08RX64 cr0=%#RX64 cr3=%#RX64 cr4=%#RX64 eflags=%#RX32\n", uExitReason,
           pVmcs->u64RoExitQual.u, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.cr0,
-          pVCpu->cpum.GstCtx.cr3, pVCpu->cpum.GstCtx.cr4, pVCpu->cpum.GstCtx.eflags.u32));
+          pVCpu->cpum.GstCtx.cr3, pVCpu->cpum.GstCtx.cr4, pVCpu->cpum.GstCtx.eflags.u));
 
     /*