Changeset 100788 in vbox

Timestamp:

Aug 3, 2023 10:12:58 PM (16 months ago)

Author:

vboxsync

Message:

VMM/IEM: Added missing CheckMode call to iemThreadedRecompilerMcDeferToCImpl0. Issue mode change check on IEM_CIMPL_F_VMEXIT. bugref:10369

Location:

trunk/src/VBox/VMM

Files:

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

-              r100787
+              r100788
 /**
  * Built-in function that compares the fExec mask against uParam0.
+ *
+ * This is used both for IEM_CIMPL_F_MODE and IEM_CIMPL_F_VMEXIT after executing
+ * an instruction.
  */
 IEM_DECL_IEMTHREADEDFUNC_DEF(iemThreadedFunc_BltIn_CheckMode)

-              r100787
+              r100788
         # For CIMPL stuff, we need to consult the associated IEM_CIMPL_F_XXX
         # mask and maybe emit additional checks.
+        if 'IEM_CIMPL_F_MODE' in self.dsCImplFlags or 'IEM_CIMPL_F_XCPT' in self.dsCImplFlags:
+        if (   'IEM_CIMPL_F_MODE'   in self.dsCImplFlags
+            or 'IEM_CIMPL_F_XCPT'   in self.dsCImplFlags
+            or 'IEM_CIMPL_F_VMEXIT' in self.dsCImplFlags):
             aoStmts.append(iai.McCppCall('IEM_MC2_EMIT_CALL_1', ( 'kIemThreadedFunc_BltIn_CheckMode', 'pVCpu->iem.s.fExec', ),
                                          cchIndent = cchIndent));

-              r100787
+              r100788
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation, in version 3 of the
  * License.                     8
+ * License.
+ *
  * This program is distributed in the hope that it will be useful, but
 …
     IEM_MC2_BEGIN_EMIT_CALLS(fFlags & IEM_CIMPL_F_CHECK_IRQ_BEFORE);
     IEM_MC2_EMIT_CALL_2(kIemThreadedFunc_BltIn_DeferToCImpl0, (uintptr_t)pfnCImpl, IEM_GET_INSTR_LEN(pVCpu));
+    if (   (fFlags & (IEM_CIMPL_F_MODE | IEM_CIMPL_F_VMEXIT))
+        && !(fFlags & (IEM_CIMPL_F_END_TB | IEM_CIMPL_F_BRANCH_FAR)))
+        IEM_MC2_EMIT_CALL_1(kIemThreadedFunc_BltIn_CheckMode, pVCpu->iem.s.fExec);
     IEM_MC2_END_EMIT_CALLS(fFlags);

r100787	r100788
1269	1269	/** Convenience: Check for IRQ both before and after an instruction. */
1270	1270	#define IEM_CIMPL_F_CHECK_IRQ_BEFORE_AND_AFTER (IEM_CIMPL_F_CHECK_IRQ_BEFORE \| IEM_CIMPL_F_CHECK_IRQ_AFTER)
1271		/** May trigger a VM exit. */
	1271	/** May trigger a VM exit (treated like IEM_CIMPL_F_MODE atm). */
1272	1272	#define IEM_CIMPL_F_VMEXIT RT_BIT_32(10)
1273	1273	/** May modify FPU state. */

Note: See TracChangeset for help on using the changeset viewer.