Changeset 100806 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 5, 2023 1:24:42 AM (18 months ago)

Author:

vboxsync

Message:

VMM/IEM: Don't end TBs on mode change. Corrected BltIn_CheckMode to only check flags part of IEMTB_F_KEY_MASK. bugref:10369

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllThrdFuncsBltIn.cpp (modified) (1 diff)
• IEMAllThrdPython.py (modified) (1 diff)
• IEMAllThrdTables.h (modified) (1 diff)

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

@@ -136 +136 @@
 {
     uint32_t const fExpectedExec = (uint32_t)uParam0;
-    if (pVCpu->iem.s.fExec == fExpectedExec)
+    if ((pVCpu->iem.s.fExec & IEMTB_F_KEY_MASK) == (fExpectedExec & IEMTB_F_KEY_MASK))
         return VINF_SUCCESS;
-    LogFlow(("Mode changed at %04x:%08RX64: %#x -> %#x (xor: %#x)\n", pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip,
-             fExpectedExec, pVCpu->iem.s.fExec, fExpectedExec ^ pVCpu->iem.s.fExec));
+    LogFlow(("Mode changed at %04x:%08RX64: %#x -> %#x (xor: %#x, xor-key: %#x)\n",
+             pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, fExpectedExec,
+             pVCpu->iem.s.fExec, fExpectedExec ^ pVCpu->iem.s.fExec, (fExpectedExec ^ pVCpu->iem.s.fExec) & IEMTB_F_KEY_MASK));
     RT_NOREF(uParam1, uParam2);
     STAM_REL_COUNTER_INC(&pVCpu->iem.s.StatCheckModeBreaks);

trunk/src/VBox/VMM/VMMAll/IEMAllThrdPython.py

@@ -202 +202 @@
     ## @note iemThreadedRecompilerMcDeferToCImpl0 duplicates info found here.
     kdCImplFlags = {
-        'IEM_CIMPL_F_MODE':                 True,
+        'IEM_CIMPL_F_MODE':                 False,
         'IEM_CIMPL_F_BRANCH_DIRECT':        False,
         'IEM_CIMPL_F_BRANCH_INDIRECT':      False,

trunk/src/VBox/VMM/VMMAll/IEMAllThrdTables.h

@@ -312 +312 @@
     AssertCompile(IEM_CIMPL_F_BRANCH_FAR         == IEMBRANCHED_F_FAR);
 
-    if (fFlags & (IEM_CIMPL_F_END_TB | IEM_CIMPL_F_MODE | IEM_CIMPL_F_BRANCH_FAR | IEM_CIMPL_F_REP))
+    if (fFlags & (IEM_CIMPL_F_END_TB | IEM_CIMPL_F_BRANCH_FAR))
         pVCpu->iem.s.fEndTb = true;
     else if (fFlags & IEM_CIMPL_F_BRANCH_ANY)