Changeset 56081 in vbox for trunk/src

Timestamp:

May 26, 2015 2:40:22 PM (10 years ago)

Author:

vboxsync

Message:

HMSVMR0/IOIO: fUpdateRipAlready

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -4777 +4777 @@
 
     VBOXSTRICTRC rcStrict;
+    bool fUpdateRipAlready = false;
     if (IoExitInfo.n.u1STR)
     {
@@ -4823 +4824 @@
             rcStrict = IEMExecOne(pVCpu);
         }
+        fUpdateRipAlready = true;
 
 #else
@@ -4884 +4886 @@
     {
         /* AMD-V saves the RIP of the instruction following the IO instruction in EXITINFO2. */
-        pCtx->rip = pVmcb->ctrl.u64ExitInfo2;
+        if (!fUpdateRipAlready)
+            pCtx->rip = pVmcb->ctrl.u64ExitInfo2;
 
         /*