Changeset 55737 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

May 7, 2015 6:21:00 PM (10 years ago)

Author:

vboxsync

Message:

build fiX

File:

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

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

@@ -4492 +4492 @@
 
     /** @todo Decode Assist. */
-    VBOXSTRICTRC rc = IEMExecOneBypassEx(pVCpu, CPUMCTX2CORE(pCtx), NULL);
-    if (RT_UNLIKELY(   rc == VERR_IEM_ASPECT_NOT_IMPLEMENTED
-                    || rc == VERR_IEM_INSTR_NOT_IMPLEMENTED))
-        rc = VERR_EM_INTERPRETER;
-    if (rc == VINF_SUCCESS)
+    VBOXSTRICTRC rcStrict = IEMExecOneBypassEx(pVCpu, CPUMCTX2CORE(pCtx), NULL);
+    if (RT_UNLIKELY(   rcStrict == VERR_IEM_ASPECT_NOT_IMPLEMENTED
+                    || rcStrict == VERR_IEM_INSTR_NOT_IMPLEMENTED))
+        rcStrict = VERR_EM_INTERPRETER;
+    if (rcStrict == VINF_SUCCESS)
     {
         /* RIP has been updated by EMInterpretInstruction(). */
@@ -4524 +4524 @@
                 break;
         }
-        HMSVM_CHECK_SINGLE_STEP(pVCpu, rc);
+        HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
     }
     else
-        Assert(rc == VERR_EM_INTERPRETER || rc == VINF_PGM_CHANGE_MODE || rc == VINF_PGM_SYNC_CR3);
-    return rc;
+        Assert(rcStrict == VERR_EM_INTERPRETER || rcStrict == VINF_PGM_CHANGE_MODE || rcStrict == VINF_PGM_SYNC_CR3);
+    return VBOXSTRICTRC_TODO(rcStrict);
 }