Changeset 61392 in vbox

Timestamp:

Jun 2, 2016 12:47:37 AM (9 years ago)

Author:

vboxsync

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

107706

Message:

CPUMRZFpuStatePrepareHostCpuForUse: Must always set VMCPU_FF_CPUM in raw-mode.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/CPUM.cpp (modified) (1 diff)
• VMMRC/CPUMRC.cpp (modified) (1 diff)
• VMMRZ/CPUMRZ.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -92 +92 @@
  * sseblk.s. When CR0 was changed by saving the FPU state, CPUM must now inform
  * the VT-x (HMVMX) code about it as it caches the CR0 value in the VMCS.
+ *
+ *
+ * @section sec_cpum_logging        Logging Level Assignments.
+ *
+ * Following log level assignments:
+ *      - Log6 is used for FPU state management.
+ *      - Log7 is used for FPU state actualization.
  *
  */

trunk/src/VBox/VMM/VMMRC/CPUMRC.cpp

@@ -244 +244 @@
         cr0 |= X86_CR0_TS | X86_CR0_MP;
         ASMSetCR0(cr0);
-    }
-}
-
+        Log6(("CPUMRCProcessForceFlag: cr0=%#x\n", cr0));
+    }
+    else
+        Log6(("CPUMRCProcessForceFlag: no change -  cr0=%#x\n", ASMGetCR0()));
+}
+

trunk/src/VBox/VMM/VMMRZ/CPUMRZ.cpp

@@ -51 +51 @@
 #ifdef IN_RC
             cpumRZSaveHostFPUState(&pVCpu->cpum.s);
-            VMCPU_FF_SET(pVCpu, VMCPU_FF_CPUM); /* Must recalc CR0 before executing more code! */
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_CPUM);     /* Must recalc CR0 before executing more code! */
 #else
             if (cpumRZSaveHostFPUState(&pVCpu->cpum.s) == VINF_CPUM_HOST_CR0_MODIFIED)
                 HMR0NotifyCpumModifiedHostCr0(pVCpu);
 #endif
+            Log6(("CPUMRZFpuStatePrepareHostCpuForUse: #0 - %#x\n", ASMGetCR0()));
             break;
 
         case CPUM_USED_FPU_HOST:
-#if defined(IN_RING0) && ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS)
+#ifdef IN_RC
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_CPUM);     /* (should be set already) */
+#elif defined(IN_RING0) && ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS)
             if (pVCpu->cpum.s.fUseFlags | CPUM_SYNC_FPU_STATE)
             {
@@ -66 +69 @@
             }
 #endif
+            Log6(("CPUMRZFpuStatePrepareHostCpuForUse: #1 - %#x\n", ASMGetCR0()));
             break;
 
@@ -78 +82 @@
 #ifdef IN_RING0
             HMR0NotifyCpumUnloadedGuestFpuState(pVCpu);
+#else
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_CPUM);     /* Must recalc CR0 before executing more code! */
 #endif
+            Log6(("CPUMRZFpuStatePrepareHostCpuForUse: #2 - %#x\n", ASMGetCR0()));
             break;
 
@@ -121 +128 @@
             cpumRZSaveGuestFpuState(&pVCpu->cpum.s, false /*fLeaveFpuAccessible*/);
         pVCpu->cpum.s.fUseFlags |= CPUM_USED_FPU_GUEST;
+        Log7(("CPUMRZFpuStateActualizeForRead\n"));
     }
 }
@@ -149 +157 @@
 # endif
             cpumRZSaveGuestSseRegisters(&pVCpu->cpum.s);
+        Log7(("CPUMRZFpuStateActualizeSseForRead\n"));
     }
 #endif