Changeset 100778 in vbox for trunk

Timestamp:

Aug 2, 2023 8:03:13 AM (19 months ago)

Author:

vboxsync

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

158657

Message:

VMM/IEM: Corrections for 8-bit register number calculations for 64-bit mode. bugref:10369

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllThrdPython.py (modified) (1 diff)

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

@@ -386 +386 @@
 
         sRegRef = oStmt.asParams[idxReg];
-        if sRegRef.startswith('IEM_GET_MODRM_RM') >= 0:
-            sOrgExpr = 'IEM_GET_MODRM_RM_EX8(pVCpu, %s)' % (sRegRef,);
-        elif sRegRef.startswith('IEM_GET_MODRM_REG') >= 0:
-            sOrgExpr = 'IEM_GET_MODRM_REG_EX8(pVCpu, %s)' % (sRegRef,);
+        if sRegRef.startswith('IEM_GET_MODRM_RM') or sRegRef.startswith('IEM_GET_MODRM_REG'):
+            asBits = [sBit.strip() for sBit in sRegRef.replace('(', ',').replace(')', '').split(',')];
+            if len(asBits) != 3 or asBits[1] != 'pVCpu' or (asBits[0] != 'IEM_GET_MODRM_RM' and asBits[0] != 'IEM_GET_MODRM_REG'):
+                self.raiseProblem('Unexpected reference: %s (asBits=%s)' % (sRegRef, asBits));
+            sOrgExpr = asBits[0] + '_EX8(pVCpu, ' + asBits[2] + ')';
         else:
             sOrgExpr = '((%s) < 4 || (pVCpu->iem.s.fPrefixes & IEM_OP_PRF_REX) ? (%s) : (%s) + 12)' % (sRegRef, sRegRef, sRegRef);