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

Timestamp:

Jul 10, 2013 9:13:22 AM (12 years ago)

Author:

vboxsync

Message:

VMM/CPUMR0: Slightly easier to read.

File:

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

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

@@ -288 +288 @@
 
     /* If the FPU state has already been loaded, then it's a guest trap. */
-    if (pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU)
-    {
-        Assert(    ((pCtx->cr0 & (X86_CR0_MP | X86_CR0_EM | X86_CR0_TS)) == (X86_CR0_MP | X86_CR0_EM | X86_CR0_TS))
+    if (CPUMIsGuestFPUStateActive(pVCpu))
+    {
+        Assert(    ((pCtx->cr0 & (X86_CR0_MP | X86_CR0_EM | X86_CR0_TS)) == (X86_CR0_MP | X86_CR0_TS | X86_CR0_EM))
                ||  ((pCtx->cr0 & (X86_CR0_MP | X86_CR0_EM | X86_CR0_TS)) == (X86_CR0_MP | X86_CR0_TS)));
         return VINF_EM_RAW_GUEST_TRAP;
@@ -323 +323 @@
     {
         case X86_CR0_MP | X86_CR0_TS:
-        case X86_CR0_MP | X86_CR0_EM | X86_CR0_TS:
+        case X86_CR0_MP | X86_CR0_TS | X86_CR0_EM:
             return VINF_EM_RAW_GUEST_TRAP;
         default: