Changeset 59986 in vbox

Timestamp:

Mar 11, 2016 11:50:25 AM (9 years ago)

Author:

vboxsync

Message:

iemRaiseXcptOrIntInProtMode: Updated todo for ESP modifications wrt 16-bit TSS.

File:

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

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

@@ -3560 +3560 @@
         pCtx->ss.u64Base        = X86DESC_BASE(&DescSS.Legacy);
         pCtx->ss.Attr.u         = X86DESC_GET_HID_ATTR(&DescSS.Legacy);
-        pCtx->rsp               = uNewEsp - cbStackFrame; /** @todo Is the high word cleared for 16-bit stacks and/or interrupt handlers? */
+        /** @todo When coming from 32-bit code and operating with a 16-bit TSS and
+         *        16-bit handler, the high word of ESP remains unchanged (i.e. only
+         *        SP is loaded).
+         *  Need to check the other combinations too:
+         *      - 16-bit TSS, 32-bit handler
+         *      - 32-bit TSS, 16-bit handler */
+        pCtx->rsp               = uNewEsp - cbStackFrame;
         pIemCpu->uCpl           = uNewCpl;
 
@@ -3627 +3633 @@
     pCtx->cs.Attr.u         = X86DESC_GET_HID_ATTR(&DescCS.Legacy);
 
-    pCtx->rip               = uNewEip;
+    pCtx->rip               = uNewEip;  /* (The entire register is modified, see pe16_32 bs3kit tests.) */
     fEfl &= ~fEflToClear;
     IEMMISC_SET_EFL(pIemCpu, pCtx, fEfl);