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

Timestamp:

Oct 17, 2024 11:10:18 AM (4 months ago)

Author:

vboxsync

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

165248

Message:

VMM/IEM: In iemNativeEmitRetn (as everywhere else), 64-bit mode implies flat mode. bugref:10720

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompFuncs.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompFuncs.h

@@ -2358 +2358 @@
                                       ? sizeof(uint32_t)
                                       : sizeof(uint16_t);
-/** @todo the basic flatness should be detected by the threaded compiler step
- *        like for the other macros... */
-    bool      const fFlat           = IEM_F_MODE_X86_IS_FLAT(pReNative->fExec) && a_enmEffOpSize != IEMMODE_16BIT; /* see note */
-    uintptr_t const pfnFunction     = fFlat
-                                      ?   a_enmEffOpSize == IEMMODE_64BIT
-                                        ? (uintptr_t)iemNativeHlpStackFlatFetchU64
-                                        : (uintptr_t)iemNativeHlpStackFlatFetchU32
+/** @todo the basic flatness could be detected by the threaded compiler step
+ *        like for the other macros... worth it? */
+    bool      const fFlat           = a_enmEffOpSize == IEMMODE_64BIT
+                                   || (a_enmEffOpSize == IEMMODE_32BIT /* see note */ && IEM_F_MODE_X86_IS_FLAT(pReNative->fExec));
+    uintptr_t const pfnFunction     = a_enmEffOpSize == IEMMODE_64BIT
+                                    ? (uintptr_t)iemNativeHlpStackFlatFetchU64
+                                    : fFlat
+                                      ? (uintptr_t)iemNativeHlpStackFlatFetchU32
                                       :   a_enmEffOpSize == IEMMODE_32BIT
                                         ? (uintptr_t)iemNativeHlpStackFetchU32