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

Timestamp:

Apr 9, 2023 1:22:06 AM (22 months ago)

Author:

vboxsync

Message:

VMM/IEM: Eliminate some unused parameters/references in the threaded functions in the two cases where we outright modify references. bugref:10369

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllThreadedPython.py (modified) (3 diffs)

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

@@ -348 +348 @@
                             assert (   sSrcParam[oCurRef.offParam : oCurRef.offParam + len(oCurRef.sOrgRef)] == oCurRef.sOrgRef
                                     or oCurRef.fCustomRef), \
-                                   'offParam=%s sOrgRef=%s sSrcParam=%s<eos>' % (oCurRef.offParam, oCurRef.sOrgRef, sSrcParam);
+                                   'offParam=%s sOrgRef=%s iParam=%s oStmt.sName=%s sSrcParam=%s<eos>' \
+                                   % (oCurRef.offParam, oCurRef.sOrgRef, oCurRef.iParam, oStmt.sName, sSrcParam);
                             oNewStmt.asParams[oCurRef.iParam] = sSrcParam[0 : oCurRef.offParam] \
                                                               + oCurRef.sNewName \
@@ -504 +505 @@
                 aiSkipParams = {};
 
-            # Several statements have implicit parameters.
+            # Several statements have implicit parameters and some have different parameters.
             if oStmt.sName in ('IEM_MC_ADVANCE_RIP_AND_FINISH', 'IEM_MC_REL_JMP_S8_AND_FINISH', 'IEM_MC_REL_JMP_S16_AND_FINISH',
                                'IEM_MC_REL_JMP_S32_AND_FINISH', 'IEM_MC_CALL_CIMPL_0', 'IEM_MC_CALL_CIMPL_1',
@@ -528 +529 @@
                     self.aoParamRefs.append(ThreadedParamRef('u32Disp', 'uint32_t', oStmt));
                     self.aoParamRefs.append(ThreadedParamRef('cbInstr', 'uint4_t',  oStmt));
+                    assert len(oStmt.asParams) == 3;
+                    assert oStmt.asParams[1].startswith('bRm');
+                    aiSkipParams[1] = True; # Skip the bRm parameter
 
             # 8-bit register accesses needs to have their index argument reworked to take REX into account.
-                # ... and IEM_MC_*_GREG_U8 into *_THREADED w/ reworked index taking REX into account
             if oStmt.sName.startswith('IEM_MC_') and oStmt.sName.find('_GREG_U8') > 0:
                 (idxReg, sOrgRef, sStdRef) = self.analyze8BitGRegStmt(oStmt);
                 self.aoParamRefs.append(ThreadedParamRef(sOrgRef, 'uint4_t', oStmt, idxReg, sStdRef = sStdRef));
+                aiSkipParams[idxReg] = True; # Skip the parameter below.
 
             # Inspect the target of calls to see if we need to pass down a