Changeset 72712 in vbox for trunk/src/VBox

Timestamp:

Jun 28, 2018 8:47:47 AM (7 years ago)

Author:

vboxsync

Message:

IEM: Fixed regression in IEMExecStringIoRead from r123057 where writes postponed to ring-3 would accidentally be rolled back.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (1 diff)
• IEMAllCImplStrInstr.cpp.h (modified) (1 diff)

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

@@ -14753 +14753 @@
     }
 
-    if (pVCpu->iem.s.cActiveMappings)
-        iemMemRollback(pVCpu);
-
+    Assert(pVCpu->iem.s.cActiveMappings == 0 || VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_IEM));
     return iemUninitExecAndFiddleStatusAndMaybeReenter(pVCpu, rcStrict);
 }

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

@@ -1407 +1407 @@
             rcStrict = IOMIOPortRead(pVM, pVCpu, u16Port, &u32Value, OP_SIZE / 8);
             if (!IOM_SUCCESS(rcStrict))
-                return rcStrict;
+            {
+                iemMemRollback(pVCpu);
+                return rcStrict;
+            }
 
             *puMem = (OP_TYPE)u32Value;