Changeset 15576 in vbox

Timestamp:

Dec 16, 2008 12:01:10 PM (16 years ago)

Author:

vboxsync

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

41085

Message:

More paranoid checks

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (1 diff)
• HWACCMInternal.mac (modified) (1 diff)
• VMMGC/HWACCMGCA.asm (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -416 +416 @@
         RTGCPTR     pCache;
         RTGCPTR     pCtx;
+        uint64_t    eflags;
     } TestOut;
     struct

trunk/src/VBox/VMM/HWACCMInternal.mac

@@ -43 +43 @@
     .TestOut.pCache           resq    1
     .TestOut.pCtx             resq    1
+    .TestOut.eflags           resq    1
     .ScratchPad.param1        resq    1
     .ScratchPad.param2        resq    1

trunk/src/VBox/VMM/VMMGC/HWACCMGCA.asm

@@ -336 +336 @@
     vmxoff
 .vmstart64_vmxon_failed:
+%ifdef VMX_USE_CACHED_VMCS_ACCESSES
+%ifdef DEBUG
+    cmp     eax, VINF_SUCCESS
+    jne     .skip_flags_save
+
+    pushf
+    pop     rdx
+    mov     [rdi + VMCSCACHE.TestOut.eflags], rdx
+.skip_flags_save:
+%endif
+%endif
     pop     rbp
     ret

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

@@ -3560 +3560 @@
     pCache->TestOut.pCache      = 0;
     pCache->TestOut.pCtx        = 0;
+    pCache->TestOut.eflags      = 0;
 #endif
 
@@ -3578 +3579 @@
     AssertMsg(pCache->TestIn.pCache       == VM_RC_ADDR(pVM, &pVM->aCpus[pVCpu->idCpu].hwaccm.s.vmx.VMCSCache), ("%RGv vs %RGv\n", pCache->TestIn.pCache, VM_RC_ADDR(pVM, &pVM->aCpus[pVCpu->idCpu].hwaccm.s.vmx.VMCSCache)));
     AssertMsg(pCache->TestIn.pCtx         == pCache->TestOut.pCtx, ("%RGv vs %RGv\n", pCache->TestIn.pCtx, pCache->TestOut.pCtx));
+    Assert(!(pCache->TestOut.eflags & X86_EFL_IF));
 #endif