Changeset 97286 in vbox for trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

Timestamp:

Oct 24, 2022 10:15:44 PM (2 years ago)

Author:

vboxsync

Message:

VMM/CPUM,IEM: Moved the CPUMCTX_INHIBIT_XXX flags into reserved EFLAGS space.

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (3 diffs)

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

@@ -197 +197 @@
 VMM_INT_DECL(bool) CPUMAssertGuestRFlagsCookie(PVM pVM, PVMCPU pVCpu)
 {
-    AssertLogRelMsgReturn(      (pVCpu->cpum.s.Guest.rflags.uBoth & ~(uint64_t)(X86_EFL_LIVE_MASK | X86_EFL_RA1_MASK))
+    AssertLogRelMsgReturn(      (  pVCpu->cpum.s.Guest.rflags.uBoth
+                                 & ~(uint64_t)(CPUMX86EFLAGS_HW_MASK_64 | CPUMX86EFLAGS_INT_MASK_64))
                              == pVM->cpum.s.fReservedRFlagsCookie
-                          && (pVCpu->cpum.s.Guest.rflags.uBoth & X86_EFL_RA1_MASK) == X86_EFL_RA1_MASK,
+                          && (pVCpu->cpum.s.Guest.rflags.uBoth & X86_EFL_RA1_MASK) == X86_EFL_RA1_MASK
+                          && (pVCpu->cpum.s.Guest.rflags.uBoth & X86_EFL_RAZ_MASK & CPUMX86EFLAGS_HW_MASK_64) == 0,
                           ("rflags=%#RX64 vs fReservedRFlagsCookie=%#RX64\n",
                            pVCpu->cpum.s.Guest.rflags.uBoth, pVM->cpum.s.fReservedRFlagsCookie),
@@ -1951 +1953 @@
          * or raw-mode). Hence we use the function below which handles the details.
          */
-        if (   pVCpu->cpum.s.Guest.fInhibit == 0
-            || (   !(pVCpu->cpum.s.Guest.fInhibit & CPUMCTX_INHIBIT_NMI)
+        if (   !(pVCpu->cpum.s.Guest.eflags.uBoth & CPUMCTX_INHIBIT_ALL_MASK)
+            || (   !(pVCpu->cpum.s.Guest.eflags.uBoth & CPUMCTX_INHIBIT_NMI)
                 && pVCpu->cpum.s.Guest.uRipInhibitInt != pVCpu->cpum.s.Guest.rip))
         {
@@ -1983 +1985 @@
          *        NONMASKABLE INTERRUPT (NMI)" in SDM 3A seems pretty clear to me.
          */
-        if (!(pVCpu->cpum.s.Guest.fInhibit & CPUMCTX_INHIBIT_NMI))
+        if (!(pVCpu->cpum.s.Guest.eflags.uBoth & CPUMCTX_INHIBIT_NMI))
             return CPUMINTERRUPTIBILITY_INT_INHIBITED;
         return CPUMINTERRUPTIBILITY_NMI_INHIBIT;