Changeset 100149 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 10, 2023 8:49:28 PM (21 months ago)

Author:

vboxsync

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

157844

Message:

VMM/IEM: Emit extra mode-check after CIMPL calls with the IEM_CIMPL_F_MODE or IEM_CIMPL_F_XCPT flags set. bugref:10369

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllThreadedFunctions.cpp (modified) (1 diff)
• IEMAllThreadedPython.py (modified) (9 diffs)

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

@@ -595 +595 @@
 
 
+/**
+ * Built-in function that compares the fExec mask against uParam0.
+ */
+static IEM_DECL_IMPL_DEF(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckMode,
+                         (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2))
+{
+    uint32_t const fExpectedExec = (uint32_t)uParam0;
+    if (pVCpu->iem.s.fExec == fExpectedExec)
+        return VINF_SUCCESS;
+    Log12(("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));
+    RT_NOREF(uParam1, uParam2);
+    return VINF_IEM_REEXEC_MODE_CHANGED;
+}
+
 /*
  * The threaded functions.

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

@@ -196 +196 @@
     ## @}
 
+    ## IEM_CIMPL_F_XXX flags that we know.
+    kdCImplFlags = {
+        'IEM_CIMPL_F_MODE':             True,
+        'IEM_CIMPL_F_BRANCH':           False,
+        'IEM_CIMPL_F_RFLAGS':           False,
+        'IEM_CIMPL_F_STATUS_FLAGS':     False,
+        'IEM_CIMPL_F_VMEXIT':           False,
+        'IEM_CIMPL_F_FPU':              False,
+        'IEM_CIMPL_F_REP':              False,
+        'IEM_CIMPL_F_END_TB':           False,
+        'IEM_CIMPL_F_XCPT':             True,
+    };
+
     def __init__(self, oThreadedFunction, sVariation = ksVariation_Default):
         self.oParent        = oThreadedFunction # type: ThreadedFunction
@@ -210 +223 @@
         ## List/tree of statements for the threaded function.
         self.aoStmtsForThreadedFunction = [] # type: list(McStmt)
+
+        ## Dictionary with any IEM_CIMPL_F_XXX flags associated to the code block.
+        self.dsCImplFlags   = { }           # type: dict(str, bool)
 
         ## Function enum number, for verification. Set by generateThreadedFunctionsHeader.
@@ -464 +480 @@
         return (aoThreadedStmts, iParamRef);
 
+    def analyzeCodeOperation(self, aoStmts):
+        """
+        Analyzes the code looking clues as to additional side-effects.
+
+        Currently this is simply looking for any IEM_IMPL_C_F_XXX flags and
+        collecting these in self.dsCImplFlags.
+        """
+        for oStmt in aoStmts:
+            if oStmt.sName.startswith('IEM_MC_CALL_CIMPL_') or oStmt.sName.startswith('IEM_MC_DEFER_TO_CIMPL_'):
+                sFlagsSansComments = iai.McBlock.stripComments(oStmt.asParams[0]);
+                for sFlag in sFlagsSansComments.split('|'):
+                    sFlag = sFlag.strip();
+                    if sFlag != '0':
+                        if sFlag in self.kdCImplFlags:
+                            self.dsCImplFlags[sFlag] = True;
+                        else:
+                            self.raiseProblem('Unknown CIMPL flag value: %s' % (sFlag,));
+
+            # Process branches of conditionals recursively.
+            if isinstance(oStmt, iai.McStmtCond):
+                self.analyzeCodeOperation(oStmt.aoIfBranch);
+                if oStmt.aoElseBranch:
+                    self.analyzeCodeOperation(oStmt.aoElseBranch);
+
+        return True;
+
+
     def analyzeConsolidateThreadedParamRefs(self):
         """
@@ -543 +586 @@
     ksHexDigits = '0123456789abcdefABCDEF';
 
-    def analyzeFindThreadedParamRefs(self, aoStmts):
+    def analyzeFindThreadedParamRefs(self, aoStmts): # pylint: disable=too-many-statements
         """
         Scans the statements for things that have to passed on to the threaded
@@ -777 +820 @@
         self.analyzeConsolidateThreadedParamRefs();
 
+        # Scan the code for IEM_CIMPL_F_ and other clues.
+        self.analyzeCodeOperation(aoStmts);
+
         # Morph the statement stream for the block into what we'll be using in the threaded function.
         (self.aoStmtsForThreadedFunction, iParamRef) = self.analyzeMorphStmtForThreaded(aoStmts);
@@ -786 +832 @@
     def emitThreadedCallStmts(self, cchIndent):
         """
-        Produces a generic C++ statment that emits a call to the thread function variation.
-        """
+        Produces generic C++ statments that emits a call to the thread function
+        variation and any subsequent checks that may be necessary after that.
+        """
+        # The call to the threaded function.
         sCode = 'IEM_MC2_EMIT_CALL_%s(%s' % (self.cMinParams, self.getIndexName(), );
         for iParam in range(self.cMinParams):
@@ -801 +849 @@
             sCode += ', ' + ' | '.join(asFrags);
         sCode += ');';
-        return [iai.McCppGeneric(sCode, cchIndent = cchIndent),];
+        aoStmts = [ iai.McCppGeneric(sCode, 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.dsCImplFlags or 'IEM_CIMPL_F_XCPT' in self.dsCImplFlags:
+            aoStmts.append(iai.McCppGeneric('IEM_MC2_EMIT_CALL_1(kIemThreadedFunc_CheckMode, pVCpu->iem.s.fExec);',
+                                            cchIndent = cchIndent));
+
+        return aoStmts;
 
 
@@ -1139 +1195 @@
             '{',
             '    kIemThreadedFunc_Invalid = 0,',
+            '',
+            '    /*'
+            '     * Predefined'
+            '     */'
+            '    kIemThreadedFunc_CheckMode,',
         ];
-        iThreadedFunction = 0;
+        iThreadedFunction = 1;
         for sVariation in ThreadedFunctionVariation.kasVariationsEmitOrder:
             asLines += [
@@ -1288 +1349 @@
                    + 'const PFNIEMTHREADEDFUNC g_apfnIemThreadedFunctions[kIemThreadedFunc_End] =\n'
                    + '{\n'
-                   + '    /*Invalid*/ NULL, \n');
-        iThreadedFunction = 0;
+                   + '    /*Invalid*/ NULL,\n'
+                   + '\n'
+                   + '    /*\n'
+                   + '     * Predefined.\n'
+                   + '     */'
+                   + '    iemThreadedFunc_BltIn_CheckMode,\n'
+                   );
+        iThreadedFunction = 1;
         for sVariation in ThreadedFunctionVariation.kasVariationsEmitOrder:
             oOut.write(  '\n'