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

Timestamp:

Oct 20, 2017 2:50:34 PM (7 years ago)

Author:

vboxsync

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

118457

Message:

IEM: Do not clip EIP to 16 bits when running 16-bit code, Intel doesn't either (see bugref:7851). Fixes Plan 9.

File:

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

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

@@ -6554 +6554 @@
     AssertCompile(IEMMODE_16BIT == 0 && IEMMODE_32BIT == 1 && IEMMODE_64BIT == 2);
 #if ARCH_BITS >= 64
-    static uint64_t const s_aRipMasks[] = { UINT64_C(0xffff), UINT64_C(0xffffffff), UINT64_MAX };
+    static uint64_t const s_aRipMasks[] = { UINT64_C(0xffffffff), UINT64_C(0xffffffff), UINT64_MAX };
     Assert(pCtx->rip <= s_aRipMasks[(unsigned)pVCpu->iem.s.enmCpuMode]);
     pCtx->rip = (pCtx->rip + cbInstr) & s_aRipMasks[(unsigned)pVCpu->iem.s.enmCpuMode];
@@ -6561 +6561 @@
         pCtx->rip += cbInstr;
     else
-    {
-        static uint32_t const s_aEipMasks[] = { UINT32_C(0xffff), UINT32_MAX };
-        pCtx->eip = (pCtx->eip + cbInstr) & s_aEipMasks[(unsigned)pVCpu->iem.s.enmCpuMode];
-    }
+        pCtx->eip += cbInstr;
 #endif
 }