Changeset 65192 in vbox

Timestamp:

Jan 7, 2017 10:46:49 PM (8 years ago)

Author:

vboxsync

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

112696

Message:

IEM: PUSHF in V86 mode needs to increment rIP.

File:

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

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

@@ -534 +534 @@
 {
     PCPUMCTX pCtx = IEM_GET_CTX(pVCpu);
+    VBOXSTRICTRC rcStrict;
 
     /*
@@ -549 +550 @@
         fEfl &= ~X86_EFL_IF;          /* (RF and VM are out of range) */
         fEfl |= (fEfl & X86_EFL_VIF) >> (19 - 9);
-        return iemMemStackPushU16(pVCpu, (uint16_t)fEfl);
-    }
-
-    /*
-     * Ok, clear RF and VM, adjust for ancient CPUs, and push the flags.
-     */
-    fEfl &= ~(X86_EFL_RF | X86_EFL_VM);
-
-    VBOXSTRICTRC rcStrict;
-    switch (enmEffOpSize)
-    {
-        case IEMMODE_16BIT:
-            AssertCompile(IEMTARGETCPU_8086 <= IEMTARGETCPU_186 && IEMTARGETCPU_V20 <= IEMTARGETCPU_186 && IEMTARGETCPU_286 > IEMTARGETCPU_186);
-            if (IEM_GET_TARGET_CPU(pVCpu) <= IEMTARGETCPU_186)
-                fEfl |= UINT16_C(0xf000);
-            rcStrict = iemMemStackPushU16(pVCpu, (uint16_t)fEfl);
-            break;
-        case IEMMODE_32BIT:
-            rcStrict = iemMemStackPushU32(pVCpu, fEfl);
-            break;
-        case IEMMODE_64BIT:
-            rcStrict = iemMemStackPushU64(pVCpu, fEfl);
-            break;
-        IEM_NOT_REACHED_DEFAULT_CASE_RET();
+        rcStrict = iemMemStackPushU16(pVCpu, (uint16_t)fEfl);
+    }
+    else
+    {
+
+        /*
+         * Ok, clear RF and VM, adjust for ancient CPUs, and push the flags.
+         */
+        fEfl &= ~(X86_EFL_RF | X86_EFL_VM);
+
+        switch (enmEffOpSize)
+        {
+            case IEMMODE_16BIT:
+                AssertCompile(IEMTARGETCPU_8086 <= IEMTARGETCPU_186 && IEMTARGETCPU_V20 <= IEMTARGETCPU_186 && IEMTARGETCPU_286 > IEMTARGETCPU_186);
+                if (IEM_GET_TARGET_CPU(pVCpu) <= IEMTARGETCPU_186)
+                    fEfl |= UINT16_C(0xf000);
+                rcStrict = iemMemStackPushU16(pVCpu, (uint16_t)fEfl);
+                break;
+            case IEMMODE_32BIT:
+                rcStrict = iemMemStackPushU32(pVCpu, fEfl);
+                break;
+            case IEMMODE_64BIT:
+                rcStrict = iemMemStackPushU64(pVCpu, fEfl);
+                break;
+            IEM_NOT_REACHED_DEFAULT_CASE_RET();
+        }
     }
     if (rcStrict != VINF_SUCCESS)