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

Timestamp:

Feb 23, 2024 12:26:32 AM (12 months ago)

Author:

vboxsync

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

161888

Message:

VMM/IEM: More helpful way to make the MC block names unique. bugref:10370

File:

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

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

@@ -1505 +1505 @@
         ## @}
 
+        ## All the MC blocks associated with this instruction.
+        self.aoMcBlocks     = []        # type: List[McBlock]
+
     def toString(self, fRepr = False):
         """ Turn object into a string. """
@@ -1867 +1870 @@
                     return oHit;
         return None;
+
+    @staticmethod
+    def countStmtsByName(aoStmts, dNames, dRet):
+        """
+        Searches the given list of statements for the names in the dictionary,
+        adding each found to dRet with an occurnece count.
+
+        return total number of hits;
+        """
+        cHits = 0;
+        for oStmt in aoStmts:
+            if oStmt.sName in dNames:
+                dRet[oStmt.sName] = dRet.get(oStmt.sName, 0) + 1;
+                cHits += 1;
+            if isinstance(oStmt, McStmtCond):
+                cHits += McStmt.countStmtsByName(oStmt.aoIfBranch,   dNames, dRet);
+                cHits += McStmt.countStmtsByName(oStmt.aoElseBranch, dNames, dRet);
+        return cHits;
 
     def isCppStmt(self):
@@ -5364 +5385 @@
             self.raiseError(oXcpt.args[0]);
 
+        if self.oCurMcBlock.oInstruction:
+            self.oCurMcBlock.oInstruction.aoMcBlocks.append(self.oCurMcBlock);
         self.iMcBlockInFunc += 1;
         return True;
@@ -5528 +5551 @@
 
         g_aoMcBlocks.append(oMcBlock);
+        if oMcBlock.oInstruction:
+            oMcBlock.oInstruction.aoMcBlocks.append(oMcBlock);
         self.cTotalMcBlocks += 1;
         self.iMcBlockInFunc += 1;
@@ -6061 +6086 @@
 
 # Some sanity checking.
-for sClass, dLists in SimpleParser.kdEFlagsClasses.items():
-    for sAttrib, asFlags in dLists.items():
-        for sFlag in asFlags:
-            assert sFlag in g_kdEFlagsMnemonics, 'sClass=%s sAttrib=%s sFlag=%s' % (sClass, sAttrib, sFlag,);
+def __sanityCheckEFlagsClasses():
+    for sClass, dLists in SimpleParser.kdEFlagsClasses.items():
+        for sAttrib, asFlags in dLists.items():
+            for sFlag in asFlags:
+                assert sFlag in g_kdEFlagsMnemonics, 'sClass=%s sAttrib=%s sFlag=%s' % (sClass, sAttrib, sFlag,);
+__sanityCheckEFlagsClasses();
 
 ## The parsed content of IEMAllInstCommonBodyMacros.h.