Changeset 98842 in vbox

Timestamp:

Mar 6, 2023 5:14:45 PM (2 years ago)

Author:

vboxsync

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

156165

Message:

VMM/IEM,ValKit: Require explicit instruction file loading call for IEMAllInstructionsPython.py. bugref:10369

Location:

trunk/src/VBox

Files:

• VMM/VMMAll/IEMAllInstructionsPython.py (modified) (8 diffs)
• ValidationKit/bootsectors/bs3-cpu-generated-1-data.py (modified) (1 diff)

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

@@ -10 +10 @@
 disassembler tables and tests.
 """
+
+from __future__ import print_function;
 
 __copyright__ = \
@@ -1600 +1602 @@
 
         # The /r form:
-        if len(sOpcode) == 4 and sOpcode.startswith('/') and sOpcode[-1].isdigit():
-            return int(sOpcode[-1:]) << 3;
+        if len(sOpcode) == 2 and sOpcode[0] == '/' and sOpcode[1].isdigit():
+            return int(sOpcode[1:]) << 3;
 
         # The 11/r form:
@@ -3645 +3647 @@
     return 0;
 
-def __parseAll():
+## List of all main instruction files and their default maps.
+g_aasAllInstrFilesAndDefaultMap = (
+    ( 'IEMAllInstructionsOneByte.cpp.h',   'one',        ),
+    ( 'IEMAllInstructionsTwoByte0f.cpp.h', 'two0f',      ),
+    ( 'IEMAllInstructionsThree0f38.cpp.h', 'three0f38',  ),
+    ( 'IEMAllInstructionsThree0f3a.cpp.h', 'three0f3a',  ),
+    ( 'IEMAllInstructionsVexMap1.cpp.h',   'vexmap1',    ),
+    ( 'IEMAllInstructionsVexMap2.cpp.h',   'vexmap2',    ),
+    ( 'IEMAllInstructionsVexMap3.cpp.h',   'vexmap3',    ),
+    ( 'IEMAllInstructions3DNow.cpp.h',     '3dnow',      ),
+);
+
+def parseAll():
     """
     Parses all the IEMAllInstruction*.cpp.h files.
@@ -3653 +3667 @@
     sSrcDir = os.path.dirname(os.path.abspath(__file__));
     cErrors = 0;
-    for sDefaultMap, sName in [
-        ( 'one',        'IEMAllInstructionsOneByte.cpp.h'),
-        ( 'two0f',      'IEMAllInstructionsTwoByte0f.cpp.h'),
-        ( 'three0f38',  'IEMAllInstructionsThree0f38.cpp.h'),
-        ( 'three0f3a',  'IEMAllInstructionsThree0f3a.cpp.h'),
-        ( 'vexmap1',    'IEMAllInstructionsVexMap1.cpp.h'),
-        ( 'vexmap2',    'IEMAllInstructionsVexMap2.cpp.h'),
-        ( 'vexmap3',    'IEMAllInstructionsVexMap3.cpp.h'),
-        ( '3dnow',      'IEMAllInstructions3DNow.cpp.h'),
-    ]:
+    for sName, sDefaultMap in g_aasAllInstrFilesAndDefaultMap:
         cErrors += __parseFileByName(os.path.join(sSrcDir, sName), sDefaultMap);
     cErrors += __doTestCopying();
@@ -3675 +3680 @@
 
     if cErrors != 0:
-        #raise Exception('%d parse errors' % (cErrors,));
-        sys.exit(1);
+        raise Exception('%d parse errors' % (cErrors,));
     return True;
 
-
-
-__parseAll();
 
 
@@ -3718 +3719 @@
     elif oInstr.sEncoding == 'ModR/M':
         # ASSUME the first operand is using the ModR/M encoding
-        assert len(oInstr.aoOperands) >= 1 and oInstr.aoOperands[0].usesModRM();
+        assert len(oInstr.aoOperands) >= 1 and oInstr.aoOperands[0].usesModRM(), "oInstr=%s" % (oInstr,);
         asColumns.append('IDX_ParseModRM,');
     elif oInstr.sEncoding in [ 'prefix', ]:
@@ -3837 +3838 @@
     """
     Generates disassembler tables.
+
+    Returns exit code.
     """
+
+    #
+    # Parse all.
+    #
+    try:
+        parseAll();
+    except Exception as oXcpt:
+        print('error: parseAll failed: %s' % (oXcpt,), file = sys.stderr);
+        return 1;
+
 
     #
@@ -3948 +3961 @@
         oDstFile.write('\n');
         #break; #for now
+    return 0;
 
 if __name__ == '__main__':
-    generateDisassemblerTables();
-
+    sys.exit(generateDisassemblerTables());
+

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-data.py

@@ -452 +452 @@
         Returns success indicator.
         """
+
+        #
+        # Do the parsing.
+        #
+        try:
+            iai.parseAll();
+        except Exception as oXcpt:
+            print('error: parseAll failed: %s' % (oXcpt,), file = sys.stderr);
+            return False;
 
         #