Changeset 100889 in vbox for trunk/src/VBox

Timestamp:

Aug 16, 2023 10:31:44 PM (19 months ago)

Author:

vboxsync

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

158821

Message:

VMM/IEM: Adjusted IEM_MC_CALL_CIMPL_HLP_RET assertion to account for fExec not including the FLAT 32-bit flag if DS, ES or SS state is stored externally (HM, NEM). bugref:10369

Location:

trunk/src/VBox/VMM/include

Files:

• IEMInline.h (modified) (2 diffs)
• IEMInternal.h (modified) (1 diff)
• IEMMc.h (modified) (1 diff)

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

@@ -179 +179 @@
  * ASSUMES that the CPU is in 32-bit mode.
  *
+ * @note    Will return zero when if any of the segment register state is marked
+ *          external, this must be factored into assertions checking fExec
+ *          consistency.
+ *
  * @returns IEM_F_MODE_X86_32BIT_FLAT or zero.
  * @param   pVCpu               The cross context virtual CPU structure of the
@@ -213 +217 @@
  *
  * This is used by sysenter.
+ *
+ * @note    Will return zero when if any of the segment register state is marked
+ *          external, this must be factored into assertions checking fExec
+ *          consistency.
  *
  * @returns IEM_F_MODE_X86_32BIT_FLAT or zero.

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

@@ -1290 +1290 @@
  * @param   a_fExtrnMbz     The mask of CPUMCTX_EXTRN_XXX flags that must be zero.
  */
-#define IEM_CTX_ASSERT(a_pVCpu, a_fExtrnMbz)    AssertMsg(!((a_pVCpu)->cpum.GstCtx.fExtrn & (a_fExtrnMbz)), \
-                                                          ("fExtrn=%#RX64 fExtrnMbz=%#RX64\n", (a_pVCpu)->cpum.GstCtx.fExtrn, \
-                                                          (a_fExtrnMbz)))
+#define IEM_CTX_ASSERT(a_pVCpu, a_fExtrnMbz) \
+   AssertMsg(!((a_pVCpu)->cpum.GstCtx.fExtrn & (a_fExtrnMbz)), \
+             ("fExtrn=%#RX64 & fExtrnMbz=%#RX64 -> %#RX64\n", \
+             (a_pVCpu)->cpum.GstCtx.fExtrn, (a_fExtrnMbz), (a_pVCpu)->cpum.GstCtx.fExtrn & (a_fExtrnMbz) ))
 
 /** @def IEM_CTX_IMPORT_RET

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

@@ -2067 +2067 @@
             { \
                 uint32_t fExecRecalc = iemCalcExecFlags(pVCpu) | (pVCpu->iem.s.fExec & IEM_F_USER_OPTS); \
-                AssertMsg(fExecBefore == fExecRecalc, \
+                AssertMsg(   fExecBefore == fExecRecalc \
+                             /* in case ES, DS or SS was external initially (happens alot with HM): */ \
+                          || (   fExecBefore == (fExecRecalc & ~IEM_F_MODE_X86_FLAT_OR_PRE_386_MASK) \
+                              && (fExecRecalc & IEM_F_MODE_CPUMODE_MASK) == IEMMODE_32BIT), \
                           ("fExec=%#x -> %#x (diff %#x)\n", fExecBefore, fExecRecalc, fExecBefore ^ fExecRecalc)); \
             } \