Changeset 106117 in vbox for trunk/src/VBox/VMM/VMMAll/target-x86

Timestamp:

Sep 23, 2024 1:59:08 PM (5 months ago)

Author:

vboxsync

Message:

VMM/IEM: Recompilation-time checks of skipped EFLAGS. bugref:10720

File:

• trunk/src/VBox/VMM/VMMAll/target-x86/IEMAllN8veEmit-x86.h (modified) (7 diffs)

trunk/src/VBox/VMM/VMMAll/target-x86/IEMAllN8veEmit-x86.h

@@ -217 +217 @@
     {
         STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeEflSkippedLogical);
+        pReNative->fSkippingEFlags |= X86_EFL_STATUS_BITS;
 # ifdef IEMNATIVE_STRICT_EFLAGS_SKIPPING
         off = iemNativeEmitOrImmIntoVCpuU32(pReNative, off, X86_EFL_STATUS_BITS, RT_UOFFSETOF(VMCPU, iem.s.fSkippingEFlags));
@@ -290 +291 @@
         IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
 
-#  ifdef IEMNATIVE_STRICT_EFLAGS_SKIPPING
+#ifdef IEMNATIVE_WITH_EFLAGS_SKIPPING
+        pReNative->fSkippingEFlags &= ~X86_EFL_STATUS_BITS;
+# ifdef IEMNATIVE_STRICT_EFLAGS_SKIPPING
         off = iemNativeEmitStoreImmToVCpuU32(pReNative, off, 0, RT_UOFFSETOF(VMCPU, iem.s.fSkippingEFlags));
-#  endif
+# endif
+#endif
     }
     return off;
@@ -321 +325 @@
     {
         STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeEflSkippedArithmetic);
+        pReNative->fSkippingEFlags |= X86_EFL_STATUS_BITS;
 # ifdef IEMNATIVE_STRICT_EFLAGS_SKIPPING
         off = iemNativeEmitOrImmIntoVCpuU32(pReNative, off, X86_EFL_STATUS_BITS, RT_UOFFSETOF(VMCPU, iem.s.fSkippingEFlags));
@@ -328 +333 @@
 #endif
     {
-#ifdef IEMNATIVE_STRICT_EFLAGS_SKIPPING
+#ifdef IEMNATIVE_WITH_EFLAGS_SKIPPING
         uint32_t fSkipped = 0;
 #endif
@@ -485 +490 @@
         IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
 
-#ifdef IEMNATIVE_STRICT_EFLAGS_SKIPPING
+#ifdef IEMNATIVE_WITH_EFLAGS_SKIPPING
+        pReNative->fSkippingEFlags = fSkipped;
+# ifdef IEMNATIVE_STRICT_EFLAGS_SKIPPING
         off = iemNativeEmitStoreImmToVCpuU32(pReNative, off, fSkipped, RT_UOFFSETOF(VMCPU, iem.s.fSkippingEFlags));
+# endif
 #endif
     }
@@ -1572 +1580 @@
     {
         STAM_COUNTER_INC(&pReNative->pVCpu->iem.s.StatNativeEflSkippedShift);
+        pReNative->fSkippingEFlags |= X86_EFL_STATUS_BITS;
 # ifdef IEMNATIVE_STRICT_EFLAGS_SKIPPING
         off = iemNativeEmitOrImmIntoVCpuU32(pReNative, off, X86_EFL_STATUS_BITS, RT_UOFFSETOF(VMCPU, iem.s.fSkippingEFlags));
@@ -1736 +1745 @@
         IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
 
-#  ifdef IEMNATIVE_STRICT_EFLAGS_SKIPPING
+#ifdef IEMNATIVE_WITH_EFLAGS_SKIPPING
+        pReNative->fSkippingEFlags = 0;
+# ifdef IEMNATIVE_STRICT_EFLAGS_SKIPPING
         off = iemNativeEmitStoreImmToVCpuU32(pReNative, off, 0, RT_UOFFSETOF(VMCPU, iem.s.fSkippingEFlags));
-#  endif
+# endif
+#endif
     }
     return off;