Changeset 15364 in vbox

Timestamp:

Dec 12, 2008 1:19:02 PM (16 years ago)

Author:

vboxsync

Message:

Cleanup + extra check

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (4 diffs)

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

@@ -2125 +2125 @@
     rc |= VMXReadCachedVMCS(VMX_VMCS32_RO_VM_INSTR_ERROR, &instrError);
     rc |= VMXReadCachedVMCS(VMX_VMCS32_RO_EXIT_INSTR_LENGTH, &cbInstr);
-    rc |= VMXReadCachedVMCS(VMX_VMCS32_RO_EXIT_INTERRUPTION_INFO, &val);
-    intInfo   = val;
-    rc |= VMXReadCachedVMCS(VMX_VMCS32_RO_EXIT_INTERRUPTION_ERRCODE, &val);
-    errCode   = val;    /* might not be valid; depends on VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_IS_VALID. */
-    rc |= VMXReadCachedVMCS(VMX_VMCS32_RO_EXIT_INSTR_INFO, &val);
-    instrInfo = val;
-    rc |= VMXReadCachedVMCS(VMX_VMCS_RO_EXIT_QUALIFICATION, &val);
-    exitQualification = val;
+    rc |= VMXReadCachedVMCS(VMX_VMCS32_RO_EXIT_INTERRUPTION_INFO, &intInfo);
+    /* might not be valid; depends on VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_IS_VALID. */
+    rc |= VMXReadCachedVMCS(VMX_VMCS32_RO_EXIT_INTERRUPTION_ERRCODE, &errCode);
+    rc |= VMXReadCachedVMCS(VMX_VMCS32_RO_EXIT_INSTR_INFO, &instrInfo);
+    rc |= VMXReadCachedVMCS(VMX_VMCS_RO_EXIT_QUALIFICATION, &exitQualification);
     AssertRC(rc);
 
@@ -2184 +2181 @@
 
     Log2(("E%d", exitReason));
-    Log2(("Exit reason %d, exitQualification %RGv\n", exitReason, exitQualification));
-    Log2(("instrInfo=%d instrError=%d instr length=%d\n", instrInfo, instrError, cbInstr));
-    Log2(("Interruption error code %d\n", errCode));
-    Log2(("IntInfo = %08x\n", intInfo));
+    Log2(("Exit reason %d, exitQualification %RGv\n", (uint32_t)exitReason, exitQualification));
+    Log2(("instrInfo=%d instrError=%d instr length=%d\n", (uint32_t)instrInfo, (uint32_t)instrError, (uint32_t)cbInstr));
+    Log2(("Interruption error code %d\n", (uint32_t)errCode));
+    Log2(("IntInfo = %08x\n", (uint32_t)intInfo));
     Log2(("New EIP=%RGv\n", (RTGCPTR)pCtx->rip));
 
@@ -3566 +3563 @@
     rc = pVM->hwaccm.s.pfnHost32ToGuest64R0(pVM);
 
+#ifdef VBOX_STRICT
+    RTHCUINTREG  uFlagsTest = ASMGetFlags();
+#endif
+
     ASMSetFlags(uFlags);
 
@@ -3582 +3583 @@
 
     VMXActivateVMCS(pVCpu->hwaccm.s.vmx.pVMCSPhys);
+    Assert(!(uFlagsTest & X86_EFL_IF));
     return rc;
 }