Changeset 97630 in vbox for trunk/src/VBox

Timestamp:

Nov 21, 2022 2:13:56 PM (2 years ago)

Author:

vboxsync

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

154676

Message:

VMM/IEM: Corrected the default operand size for retf; Correected ESP handling with o64 retf to 32-bit or 16-bit code. bugref:9898

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllCImpl.cpp (modified) (1 diff)
• IEMAllInstructionsOneByte.cpp.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp

@@ -2546 +2546 @@
         else
             pVCpu->cpum.GstCtx.ss.u64Base    = X86DESC_BASE(&DescSs.Legacy);
-        if (!pVCpu->cpum.GstCtx.ss.Attr.n.u1DefBig && pVCpu->iem.s.enmCpuMode != IEMMODE_64BIT)
+        if (pVCpu->iem.s.enmCpuMode == IEMMODE_64BIT)
+            pVCpu->cpum.GstCtx.rsp           = uNewOuterRsp;
+        else if (pVCpu->cpum.GstCtx.ss.Attr.n.u1DefBig)
+            pVCpu->cpum.GstCtx.rsp           = (uint32_t)uNewOuterRsp;
+        else
             pVCpu->cpum.GstCtx.sp            = (uint16_t)uNewOuterRsp;
-        else
-            pVCpu->cpum.GstCtx.rsp           = uNewOuterRsp;
 
         pVCpu->iem.s.uCpl           = (uNewCs & X86_SEL_RPL);

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

@@ -6518 +6518 @@
     uint16_t u16Imm; IEM_OPCODE_GET_NEXT_U16(&u16Imm);
     IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
-    IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     return IEM_MC_DEFER_TO_CIMPL_2(iemCImpl_retf, pVCpu->iem.s.enmEffOpSize, u16Imm);
 }
@@ -6530 +6529 @@
     IEMOP_MNEMONIC(retf, "retf");
     IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
-    IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     return IEM_MC_DEFER_TO_CIMPL_2(iemCImpl_retf, pVCpu->iem.s.enmEffOpSize, 0);
 }