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

Timestamp:

Jan 4, 2024 11:10:56 PM (15 months ago)

Author:

vboxsync

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

160950

Message:

VMM/IEM: Tweaked the PUSH/POP -> FLAT64 variants since all stack accesses are flat in 64-bit mode, and any fs/gs segment prefixes are only applicable to operands. (TLB lookup code generator asserted.) bugref:10371

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllThrdPython.py (modified) (2 diffs)

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

@@ -376 +376 @@
         ksVariation_64f: True,
     };
+    kdVariationsWithFlatStackAddress = {
+        ksVariation_32_Flat: True,
+        ksVariation_32f_Flat: True,
+        ksVariation_64: True,
+        ksVariation_64f: True,
+        ksVariation_64_FsGs: True,
+        ksVariation_64f_FsGs: True,
+        ksVariation_64_Addr32: True,
+        ksVariation_64f_Addr32: True,
+    };
+    kdVariationsWithFlat64StackAddress = {
+        ksVariation_64: True,
+        ksVariation_64f: True,
+        ksVariation_64_FsGs: True,
+        ksVariation_64f_FsGs: True,
+        ksVariation_64_Addr32: True,
+        ksVariation_64f_Addr32: True,
+    };
     kdVariationsWithFlatAddr16 = {
         ksVariation_16: True,
@@ -883 +901 @@
 
                 # ... PUSH and POP also needs flat variants, but these differ a little.
-                elif (    self.sVariation in self.kdVariationsWithFlatAddress
+                elif (    self.sVariation in self.kdVariationsWithFlatStackAddress
                       and (   (oNewStmt.sName.startswith('IEM_MC_PUSH') and oNewStmt.sName.find('_FPU') < 0)
                            or oNewStmt.sName.startswith('IEM_MC_POP'))):
-                    oNewStmt.sName = self.kdMemMcToFlatInfoStack[oNewStmt.sName][int(self.sVariation in (self.ksVariation_64,
-                                                                                                         self.ksVariation_64f,))];
+                    oNewStmt.sName = self.kdMemMcToFlatInfoStack[oNewStmt.sName][int(self.sVariation in
+                                                                                     self.kdVariationsWithFlat64StackAddress)];