Changeset 100050 in vbox for trunk/src/VBox

Timestamp:

Jun 2, 2023 2:19:37 PM (22 months ago)

Author:

vboxsync

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

157729

Message:

VMM/IEM: Load full RSP in 64-bit RETF to same privilege level.

File:

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

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

@@ -2572 +2572 @@
 
         /** @todo Testcase: Is this correct? */
+        bool f64BitCs = false;
         if (   DescCs.Legacy.Gen.u1Long
             && IEM_IS_LONG_MODE(pVCpu) )
@@ -2581 +2582 @@
             }
             u64Base = 0;
+            f64BitCs = true;
         }
         else
@@ -2610 +2612 @@
         /* commit */
         if (cbPop)
+/** @todo This cannot be right. We're using the old CS mode here, and iemRegAddToRspEx checks fExec. */
             iemRegAddToRspEx(pVCpu, &NewRsp, cbPop);
-        if (!pVCpu->cpum.GstCtx.ss.Attr.n.u1DefBig)
+        if (pVCpu->cpum.GstCtx.ss.Attr.n.u1DefBig || f64BitCs)
+            pVCpu->cpum.GstCtx.rsp       = NewRsp.u;
+        else
             pVCpu->cpum.GstCtx.sp        = (uint16_t)NewRsp.u;
-        else
-            pVCpu->cpum.GstCtx.rsp       = NewRsp.u;
         if (enmEffOpSize == IEMMODE_16BIT)
             pVCpu->cpum.GstCtx.rip       = uNewRip & UINT16_MAX; /** @todo Testcase: When exactly does this occur? With call it happens prior to the limit check according to Intel... */