Changeset 16102 in vbox for trunk/src/VBox

Timestamp:

Jan 20, 2009 9:42:11 PM (16 years ago)

Author:

vboxsync

Message:

CPUMR0.cpp: VBOX_ENABLE_64_BITS_GUESTS is a HWACCM local macro, use VBOX_WITH_64_BITS_GUESTS instead. Fixes guest XMM8..15 and DRx0..3 corruption.

File:

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

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

@@ -168 +168 @@
     }
 
-#if HC_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
     if (CPUMIsGuestInLongModeEx(pCtx))
     {
         /* Restore the state on entry as we need to be in 64 bits mode to access the full state. */
         pVCpu->cpum.s.fUseFlags |= CPUM_SYNC_FPU_STATE;
+RTLogPrintf("setting CPUM_SYNC_FPU_STATE\n");
     }
     else
@@ -258 +259 @@
     AssertReturn((pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU), VINF_SUCCESS);
 
-#if HC_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
     if (CPUMIsGuestInLongModeEx(pCtx))
     {
+if (!(pVCpu->cpum.s.fUseFlags & CPUM_SYNC_FPU_STATE))
+     RTLogPrintf("CPUMR0SaveGuestFPU: CPUM_SYNC_FPU_STATE is clear...\n");
+else RTLogPrintf("CPUMR0SaveGuestFPU: CPUM_SYNC_FPU_STATE is still set\n");
         if (!(pVCpu->cpum.s.fUseFlags & CPUM_SYNC_FPU_STATE))
             HWACCMR0SaveFPUState(pVM, pVCpu, pCtx);
+
 
         cpumR0RestoreHostFPUState(&pVCpu->cpum.s);
@@ -321 +326 @@
 
     /* Save the guest's debug state. The caller is responsible for DR7. */
-#if HC_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
     if (CPUMIsGuestInLongModeEx(pCtx))
     {
@@ -397 +402 @@
 
     /* Activate the guest state DR0-3; DR7 is left to the caller. */
-#if HC_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
     if (CPUMIsGuestInLongModeEx(pCtx))
     {