Changeset 97289 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Oct 25, 2022 7:56:51 AM (2 years ago)

Author:

vboxsync

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

154280

Message:

IEM: Clear interrupt shadow flags together with RF.

File:

• trunk/src/VBox/VMM/include/IEMInline.h (modified) (2 diffs)

trunk/src/VBox/VMM/include/IEMInline.h

@@ -1610 +1610 @@
 
 /**
- * Updates the RIP/EIP/IP to point to the next instruction and clears EFLAGS.RF.
+ * Updates the RIP/EIP/IP to point to the next instruction and clears EFLAGS.RF
+ * and CPUMCTX_INHIBIT_SHADOW.
  *
  * @param   pVCpu               The cross context virtual CPU structure of the calling thread.
@@ -1617 +1618 @@
 DECLINLINE(void) iemRegAddToRipAndClearRF(PVMCPUCC pVCpu, uint8_t cbInstr)
 {
-    pVCpu->cpum.GstCtx.eflags.Bits.u1RF = 0;
-
+    /* Clear RF and interrupt shadowing: */
+    AssertCompile(CPUMCTX_INHIBIT_SHADOW < UINT32_MAX);
+    pVCpu->cpum.GstCtx.eflags.uBoth &= ~(X86_EFL_RF | CPUMCTX_INHIBIT_SHADOW);
+
+    /* Update RIP: */
+#if ARCH_BITS >= 64
     AssertCompile(IEMMODE_16BIT == 0 && IEMMODE_32BIT == 1 && IEMMODE_64BIT == 2);
-#if ARCH_BITS >= 64
     static uint64_t const s_aRipMasks[] = { UINT64_C(0xffffffff), UINT64_C(0xffffffff), UINT64_MAX };
     Assert(pVCpu->cpum.GstCtx.rip <= s_aRipMasks[(unsigned)pVCpu->iem.s.enmCpuMode]);