Changeset 52882 in vbox for trunk/src/VBox

Timestamp:

Sep 29, 2014 10:13:38 AM (10 years ago)

Author:

vboxsync

Message:

IEM: Fixed inter-privilege RETF.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (modified) (2 diffs)

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

@@ -1580 +1580 @@
     if ((uNewCs & X86_SEL_RPL) != pIemCpu->uCpl)
     {
-        /* Read the return pointer, it comes before the parameters. */
+        /* Read the outer stack pointer stored *after* the parameters. */
         RTCPTRUNION uPtrStack;
         rcStrict = iemMemStackPopContinueSpecial(pIemCpu, cbPop + cbRetPtr, &uPtrStack.pv, &uNewRsp);
         if (rcStrict != VINF_SUCCESS)
             return rcStrict;
+
+        uPtrStack.pu8 += cbPop; /* Skip the parameters. */
+
         uint16_t uNewOuterSs;
         uint64_t uNewOuterRsp;
@@ -1733 +1736 @@
         pCtx->cs.u32Limit       = cbLimitCs;
         pCtx->cs.u64Base        = u64Base;
-        pCtx->rsp               = uNewRsp;
+        pCtx->rsp               = uNewOuterRsp;
         pCtx->ss.Sel            = uNewOuterSs;
         pCtx->ss.ValidSel       = uNewOuterSs;