Changeset 97511 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 11, 2022 12:24:25 PM (2 years ago)

Author:

vboxsync

Message:

VMM/IEM: Fixed 64-bit indirect far call/jmp again (intel). bugref:9898

File:

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

trunk/src/VBox/VMM/VMMAll/IEMAllInstructionsOneByte.cpp.h

@@ -11516 +11516 @@
         return IEMOP_RAISE_INVALID_OPCODE(); /* callf eax is not legal */
 
-    /* 64-bit mode: Intel has a fixed default opcode size of 64-bit. AMD64 OTOH defaults to 32-bit and ignores REX.W. */
-    if (pVCpu->iem.s.enmCpuMode != IEMMODE_64BIT)
+    /* 64-bit mode: Default is 32-bit, but only intel respects a REX.W prefix. */
+    /** @todo what does VIA do? */
+    if (pVCpu->iem.s.enmCpuMode != IEMMODE_64BIT || IEM_IS_GUEST_CPU_INTEL(pVCpu) || pVCpu->iem.s.enmEffOpSize != IEMMODE_64BIT)
     { /* likely */ }
-    else if (IEM_IS_GUEST_CPU_INTEL(pVCpu))
-        pVCpu->iem.s.enmEffOpSize = pVCpu->iem.s.enmDefOpSize = IEMMODE_64BIT; /** @todo what does VIA do? */
-    else if (pVCpu->iem.s.enmEffOpSize == IEMMODE_64BIT)
+    else
         pVCpu->iem.s.enmEffOpSize = IEMMODE_32BIT;