Changeset 101722 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAllInstPython.py

Timestamp:

Nov 3, 2023 12:36:45 AM (13 months ago)

Author:

vboxsync

Message:

VMM/IEM: Identify the different styles IEM_MC_CALL_XXX and mark these using new IEM_CIMPL_F_CALLS_XXX flags in the python scripts. This is necessary as IEM_MC_CALL_CIMPL_X, IEM_MC_CALL_FPU_AIMPL_X, IEM_MC_CALL_MMX_AIMPL_X, and IEM_MC_CALL_SSE_AIMPL_X all have hidden parameters that need to be accounted for when recompiling to native code (for more perfect register allocations for variables). Split up the different cmpxchg16b AIMPL/CIMPL variations into separate MC blocks, as we can't mix AIMPL and CIMPL calls in the same block (also, in the CIMPL case, there would be unused tail code after the call). bugref:10371

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllInstPython.py (modified) (7 diffs)

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

@@ -1973 +1973 @@
     'IEM_CIMPL_F_XCPT':                 ('IEM_CIMPL_F_BRANCH_INDIRECT', 'IEM_CIMPL_F_BRANCH_FAR',
                                          'IEM_CIMPL_F_MODE', 'IEM_CIMPL_F_RFLAGS', 'IEM_CIMPL_F_VMEXIT', ),
+    'IEM_CIMPL_F_CALLS_CIMPL':              (),
+    'IEM_CIMPL_F_CALLS_AIMPL':              (),
+    'IEM_CIMPL_F_CALLS_AIMPL_WITH_FXSTATE': (),
 };
 class McBlock(object):
@@ -1978 +1981 @@
     Microcode block (IEM_MC_BEGIN ... IEM_MC_END, IEM_MC_DEFER_TO_CIMPL_x_RET).
     """
+
+    ## @name Macro expansion types.
+    ## @{
+    kMacroExp_None    = 0;
+    kMacroExp_Entire  = 1; ##< Entire block (iBeginLine == iEndLine), original line may contain multiple blocks.
+    kMacroExp_Partial = 2; ##< Partial/mixed (cmpxchg16b), safe to assume single block.
+    ## @}
 
     def __init__(self, sSrcFile, iBeginLine, offBeginLine, oFunction, iInFunction, cchIndent = None):
@@ -2001 +2011 @@
         ##< The raw lines the block is made up of.
         self.asLines      = []              # type: List[str]
+        ## Indicates whether the block includes macro expansion parts (kMacroExp_None,
+        ## kMacroExp_Entrie, kMacroExp_Partial).
+        self.iMacroExp    = self.kMacroExp_None;
         ## IEM_MC_BEGIN: Argument count.
         self.cArgs        = -1;
@@ -4870 +4883 @@
 
         #
-        # HACK ALERT! For blocks orginating from macro expansion the start and
+        # HACK ALERT! For blocks originating from macro expansion the start and
         #             end line will be the same, but the line has multiple
         #             newlines inside it.  So, we have to do some extra tricks
@@ -4880 +4893 @@
             if not asLines[0].strip().startswith('IEM_MC_BEGIN'):
                 self.raiseError('IEM_MC_BEGIN is not the first word on the line');
+
+            # Hack alert! Detect mixed tail/head macros a la cmpxchg16b and split up the lines
+            #             so we can deal correctly with IEM_MC_END below and everything else.
+            for sLine in asLines:
+                cNewLines = sLine.count('\n');
+                assert cNewLines > 0;
+                if cNewLines > 1:
+                    asLines = self.extractLinesFromMacroExpansionLine(''.join(asLines),
+                                                                      self.oCurMcBlock.offBeginLine,
+                                                                        offEndStatementInLine
+                                                                      + sum(len(s) for s in asLines)
+                                                                      - len(asLines[-1]));
+                    self.oCurMcBlock.iMacroExp = McBlock.kMacroExp_Partial;
+                    break;
         else:
+            self.oCurMcBlock.iMacroExp = McBlock.kMacroExp_Entire;
             asLines = self.extractLinesFromMacroExpansionLine(self.asLines[self.iLine - 1],
                                                               self.oCurMcBlock.offBeginLine, offEndStatementInLine);
@@ -5207 +5235 @@
         # nested macro expansion, just to avoid lots of extra work.
         #
+        # There is only limited support for macros expanding to partial MC blocks.
+        #
         # Note! IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX and other macros someone making
         #       use of IEMOP_RAISE_INVALID_LOCK_PREFIX_RET() will be ignored here and
@@ -5214 +5244 @@
         #       Also, this way we don't produce lots of unnecessary threaded functions.
         #
-        if sBody.find("IEM_MC_BEGIN") < 0:
+        if sBody.find("IEM_MC_BEGIN") < 0 and sBody.find("IEM_MC_END") < 0:
             #self.debug('workerPreProcessDefine: irrelevant (%s: %s)' % (sName, sBody));
             return True;