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

Timestamp:

May 9, 2018 6:26:28 PM (7 years ago)

Author:

vboxsync

Message:

IEM: Allow 32-bit code in real mode like real CPUs do; fixed real mode far call with 32-bit operand size. See bugref:5653

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (1 diff)
• IEMAllCImpl.cpp.h (modified) (5 diffs)

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

@@ -3656 +3656 @@
                             uint64_t    uCr2)
 {
-    AssertReturn(pVCpu->iem.s.enmCpuMode == IEMMODE_16BIT, VERR_IEM_IPE_6);
     NOREF(uErr); NOREF(uCr2);
 

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

@@ -1825 +1825 @@
      * limit.
      */
-    if (   pVCpu->iem.s.enmCpuMode == IEMMODE_16BIT
-        && IEM_IS_REAL_OR_V86_MODE(pVCpu))
+    if (IEM_IS_REAL_OR_V86_MODE(pVCpu))
     {
         if (offSeg > pCtx->cs.u32Limit)
@@ -1995 +1994 @@
      * limit.
      */
-    if (   pVCpu->iem.s.enmCpuMode == IEMMODE_16BIT
-        && IEM_IS_REAL_OR_V86_MODE(pVCpu))
+    if (IEM_IS_REAL_OR_V86_MODE(pVCpu))
     {
         Assert(enmEffOpSize == IEMMODE_16BIT || enmEffOpSize == IEMMODE_32BIT);
 
         /* Check stack first - may #SS(0). */
-        rcStrict = iemMemStackPushBeginSpecial(pVCpu, enmEffOpSize == IEMMODE_32BIT ? 6 : 4,
+        rcStrict = iemMemStackPushBeginSpecial(pVCpu, enmEffOpSize == IEMMODE_32BIT ? 4+4 : 2+2,
                                                &uPtrRet.pv, &uNewRsp);
         if (rcStrict != VINF_SUCCESS)
@@ -2019 +2017 @@
         {
             uPtrRet.pu32[0] = pCtx->eip + cbInstr;
-            uPtrRet.pu16[3] = pCtx->cs.Sel;
+            uPtrRet.pu16[2] = pCtx->cs.Sel;
         }
         rcStrict = iemMemStackPushCommitSpecial(pVCpu, uPtrRet.pv, uNewRsp);
@@ -2249 +2247 @@
      * Real mode and V8086 mode are easy.
      */
-    if (   pVCpu->iem.s.enmCpuMode == IEMMODE_16BIT
-        && IEM_IS_REAL_OR_V86_MODE(pVCpu))
+    if (IEM_IS_REAL_OR_V86_MODE(pVCpu))
     {
         Assert(enmEffOpSize == IEMMODE_32BIT || enmEffOpSize == IEMMODE_16BIT);
@@ -4130 +4127 @@
      * Real mode and V8086 mode are easy.
      */
-    if (   pVCpu->iem.s.enmCpuMode == IEMMODE_16BIT
-        && IEM_IS_REAL_OR_V86_MODE(pVCpu))
+    if (IEM_IS_REAL_OR_V86_MODE(pVCpu))
     {
         *pSel           = uSel;