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

Timestamp:

Aug 7, 2013 4:59:58 PM (11 years ago)

Author:

vboxsync

Message:

IEM: Fixed sp/esp handling in IRET.

File:

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

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

@@ -2459 +2459 @@
         pCtx->cs.u32Limit   = cbLimitCS;
         pCtx->cs.u64Base    = X86DESC_BASE(&DescCS.Legacy);
-        pCtx->rsp           = uNewESP;
+        if (!pCtx->cs.Attr.n.u1DefBig)
+            pCtx->sp        = (uint16_t)uNewESP;
+        else
+            pCtx->rsp       = uNewESP;
         pCtx->ss.Sel        = uNewSS;
         pCtx->ss.ValidSel   = uNewSS;
@@ -2786 +2789 @@
     pCtx->cs.u32Limit   = cbLimitCS;
     pCtx->cs.u64Base    = X86DESC_BASE(&DescCS.Legacy);
-    pCtx->rsp           = uNewRsp;
+    if (pCtx->cs.Attr.n.u1Long || pCtx->cs.Attr.n.u1DefBig)
+        pCtx->rsp       = uNewRsp;
+    else
+        pCtx->sp        = (uint16_t)uNewRsp;
     pCtx->ss.Sel        = uNewSs;
     pCtx->ss.ValidSel   = uNewSs;