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

Timestamp:

Mar 14, 2023 10:34:58 AM (2 years ago)

Author:

vboxsync

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

156300

Message:

VMM/IEM: More work on processing MC blocks and generating functions from them. bugref:10369

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllThreadedPython.py (modified) (4 diffs)
• IEMThreadedFunctions.cpp (added)

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

@@ -52 +52 @@
 
 g_kdTypeInfo = {
-    # type name:    (cBits, fSigned,)
-    'int8_t':       (    8,    True, ),
-    'int16_t':      (   16,    True, ),
-    'int32_t':      (   32,    True, ),
-    'int64_t':      (   64,    True, ),
-    'uint8_t':      (    8,   False, ),
-    'uint16_t':     (   16,   False, ),
-    'uint32_t':     (   32,   False, ),
-    'uint64_t':     (   64,   False, ),
-    'uintptr_t':    (   64,   False, ), # ASSUMES 64-bit host pointer size.
-    'bool':         (    1,   False, ),
-    'IEMMODE':      (    2,   False, ),
+    # type name:    (cBits, fSigned, C-type       )
+    'int8_t':       (    8,    True, 'uint8_t',   ),
+    'int16_t':      (   16,    True, 'int16_t',   ),
+    'int32_t':      (   32,    True, 'int32_t',   ),
+    'int64_t':      (   64,    True, 'int64_t',   ),
+    'uint4_t':      (    4,   False, 'uint8_t',   ),
+    'uint8_t':      (    8,   False, 'uint8_t',   ),
+    'uint16_t':     (   16,   False, 'uint16_t',  ),
+    'uint32_t':     (   32,   False, 'uint32_t',  ),
+    'uint64_t':     (   64,   False, 'uint64_t',  ),
+    'uintptr_t':    (   64,   False, 'uintptr_t', ), # ASSUMES 64-bit host pointer size.
+    'bool':         (    1,   False, 'bool',      ),
+    'IEMMODE':      (    2,   False, 'IEMMODE',   ),
 };
 
@@ -99 +100 @@
     """
 
-    def __init__(self, sOrgRef, sType, oStmt, iParam, offParam = 0):
+    def __init__(self, sOrgRef, sType, oStmt, iParam = None, offParam = 0):
         self.sOrgRef  = sOrgRef;                    ##< The name / reference in the original code.
         self.sStdRef  = ''.join(sOrgRef.split());   ##< Normalized name to deal with spaces in macro invocations and such.
         self.sType    = sType;                      ##< The type (typically derived).
         self.oStmt    = oStmt;                      ##< The statement making the reference.
-        self.iParam   = iParam;                     ##< The parameter containing the references.
+        self.iParam   = iParam;                     ##< The parameter containing the references. None if implicit.
         self.offParam = offParam;                   ##< The offset in the parameter of the reference.
 
@@ -234 +235 @@
                     for iCurRef in range(iParamRef - 1, iParamRefFirst - 1, -1):
                         oCurRef = self.aoParamRefs[iCurRef];
-                        assert oCurRef.oStmt == oStmt;
-                        #print('iCurRef=%s iParam=%s sOrgRef=%s' % (iCurRef, oCurRef.iParam, oCurRef.sOrgRef));
-                        sSrcParam = oNewStmt.asParams[oCurRef.iParam];
-                        assert sSrcParam[oCurRef.offParam : oCurRef.offParam + len(oCurRef.sOrgRef)] == oCurRef.sOrgRef, \
-                               'offParam=%s sOrgRef=%s sSrcParam=%s<eos>' % (oCurRef.offParam, oCurRef.sOrgRef, sSrcParam);
-                        oNewStmt.asParams[oCurRef.iParam] = sSrcParam[0 : oCurRef.offParam] \
-                                                          + oCurRef.sNewName \
-                                                          + sSrcParam[oCurRef.offParam + len(oCurRef.sOrgRef) : ];
+                        if oCurRef.iParam is not None:
+                            assert oCurRef.oStmt == oStmt;
+                            #print('iCurRef=%s iParam=%s sOrgRef=%s' % (iCurRef, oCurRef.iParam, oCurRef.sOrgRef));
+                            sSrcParam = oNewStmt.asParams[oCurRef.iParam];
+                            assert sSrcParam[oCurRef.offParam : oCurRef.offParam + len(oCurRef.sOrgRef)] == oCurRef.sOrgRef, \
+                                   'offParam=%s sOrgRef=%s sSrcParam=%s<eos>' % (oCurRef.offParam, oCurRef.sOrgRef, sSrcParam);
+                            oNewStmt.asParams[oCurRef.iParam] = sSrcParam[0 : oCurRef.offParam] \
+                                                              + oCurRef.sNewName \
+                                                              + sSrcParam[oCurRef.offParam + len(oCurRef.sOrgRef) : ];
 
                 # Process branches of conditionals recursively.
@@ -338 +340 @@
             if isinstance(oStmt, (iai.McStmtVar, iai.McCppPreProc)):
                 continue;
+            if oStmt.isCppStmt() and oStmt.fDecode:
+                continue;
+
+            # Several statements have implicit 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',
+                               'IEM_MC_CALL_CIMPL_2', 'IEM_MC_CALL_CIMPL_3', 'IEM_MC_CALL_CIMPL_4', 'IEM_MC_CALL_CIMPL_5'):
+                self.aoParamRefs.append(ThreadedParamRef('cbInstr', 'uint4_t', oStmt));
+
+            # We can skip the rest for statements w/o parameters.
             if not oStmt.asParams:
-                continue;
-            if oStmt.isCppStmt() and oStmt.fDecode:
                 continue;