Changeset 102365 in vbox

Timestamp:

Nov 28, 2023 2:19:35 PM (16 months ago)

Author:

vboxsync

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

160501

Message:

VMM/IEM: Fixed bug in threaded recompiler where we'd emit the CheckMode calls with the *OLD* fExec value. bugref:10371

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllThrdPython.py (modified) (1 diff)
• IEMAllThrdRecompiler.cpp (modified) (2 diffs)

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

@@ -1249 +1249 @@
         aoStmts.append(iai.McCppCall('IEM_MC2_EMIT_CALL_%s' % (len(asCallArgs) - 1,), asCallArgs, cchIndent = cchIndent));
 
-        # 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.oParent.dsCImplFlags
-            or 'IEM_CIMPL_F_XCPT'   in self.oParent.dsCImplFlags
-            or 'IEM_CIMPL_F_VMEXIT' in self.oParent.dsCImplFlags):
-            aoStmts.append(iai.McCppCall('IEM_MC2_EMIT_CALL_1', ( 'kIemThreadedFunc_BltIn_CheckMode', 'pVCpu->iem.s.fExec', ),
-                                         cchIndent = cchIndent));
+        # 2023-11-28: This has to be done AFTER the CIMPL call, so we have to
+        #             emit this mode check from the compilation loop.  On the
+        #             plus side, this means we eliminate unnecessary call at
+        #             end of the TB. :-)
+        ## 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.oParent.dsCImplFlags
+        #    or 'IEM_CIMPL_F_XCPT'   in self.oParent.dsCImplFlags
+        #    or 'IEM_CIMPL_F_VMEXIT' in self.oParent.dsCImplFlags):
+        #    aoStmts.append(iai.McCppCall('IEM_MC2_EMIT_CALL_1', ( 'kIemThreadedFunc_BltIn_CheckMode', 'pVCpu->iem.s.fExec', ),
+        #                                 cchIndent = cchIndent));
 
         sCImplFlags = ' | '.join(self.oParent.dsCImplFlags.keys());

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

@@ -1999 +1999 @@
 
 /**
+ * Called by iemThreadedCompile when a block requires a mode check.
+ *
+ * @returns true if we should continue, false if we're out of call entries.
+ * @param   pVCpu       The cross context virtual CPU structure of the calling
+ *                      thread.
+ * @param   pTb         The translation block being compiled.
+ */
+static bool iemThreadedCompileEmitCheckMode(PVMCPUCC pVCpu, PIEMTB pTb)
+{
+    /* Emit the call. */
+    uint32_t const idxCall = pTb->Thrd.cCalls;
+    AssertReturn(idxCall < pTb->Thrd.cAllocated, false);
+    PIEMTHRDEDCALLENTRY pCall = &pTb->Thrd.paCalls[idxCall];
+    pTb->Thrd.cCalls = (uint16_t)(idxCall + 1);
+    pCall->enmFunction = kIemThreadedFunc_BltIn_CheckMode;
+    pCall->idxInstr    = pTb->cInstructions - 1;
+    pCall->uUnused0    = 0;
+    pCall->offOpcode   = 0;
+    pCall->cbOpcode    = 0;
+    pCall->idxRange    = 0;
+    pCall->auParams[0] = pVCpu->iem.s.fExec;
+    pCall->auParams[1] = 0;
+    pCall->auParams[2] = 0;
+    LogFunc(("%04x:%08RX64 fExec=%#x\n", pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->iem.s.fExec));
+    return true;
+}
+
+
+/**
  * Called by IEM_MC2_BEGIN_EMIT_CALLS() when IEM_CIMPL_F_CHECK_IRQ_BEFORE is
  * set.
@@ -2168 +2197 @@
 
             pVCpu->iem.s.cInstructions++;
+
+            /* Check for mode change _after_ certain CIMPL calls, so check that
+               we continue executing with the same mode value. */
+            if (!(pVCpu->iem.s.fTbCurInstr & (IEM_CIMPL_F_MODE | IEM_CIMPL_F_XCPT | IEM_CIMPL_F_VMEXIT)))
+            { /* probable */ }
+            else if (RT_LIKELY(iemThreadedCompileEmitCheckMode(pVCpu, pTb)))
+            { /* extremely likely */ }
+            else
+                break;
         }
         else