Changeset 16113 in vbox for trunk/src/VBox/VMM

Timestamp:

Jan 21, 2009 9:08:29 AM (16 years ago)

Author:

vboxsync

Message:

Save the host FPU/XMM state for the 32/64 case.

Location:

trunk/src/VBox/VMM

Files:

• CPUMInternal.h (modified) (1 diff)
• PGM.cpp (modified) (1 diff)
• VMMR0/CPUMR0.cpp (modified) (3 diffs)
• VMMR0/CPUMR0A.asm (modified) (4 diffs)

trunk/src/VBox/VMM/CPUMInternal.h

@@ -392 +392 @@
 DECLASM(int)      cpumR0SaveHostRestoreGuestFPUState(PCPUMCPU pCPUM);
 DECLASM(int)      cpumR0SaveGuestRestoreHostFPUState(PCPUMCPU pCPUM);
+DECLASM(int)      cpumR0SaveHostFPUState(PCPUMCPU pCPUM);
 DECLASM(int)      cpumR0RestoreHostFPUState(PCPUMCPU pCPUM);
 DECLASM(void)     cpumR0LoadFPU(PCPUMCTX pCtx);

trunk/src/VBox/VMM/PGM.cpp

@@ -1375 +1375 @@
     AssertRelease(pVM->pgm.s.HCPhysInterPaePDPT != NIL_RTHCPHYS && !(pVM->pgm.s.HCPhysInterPaePDPT & PAGE_OFFSET_MASK));
     pVM->pgm.s.HCPhysInterPaePML4 = MMPage2Phys(pVM, pVM->pgm.s.pInterPaePML4);
-    AssertRelease(pVM->pgm.s.HCPhysInterPaePML4 != NIL_RTHCPHYS && !(pVM->pgm.s.HCPhysInterPaePML4 & PAGE_OFFSET_MASK));
+    AssertRelease(pVM->pgm.s.HCPhysInterPaePML4 != NIL_RTHCPHYS && !(pVM->pgm.s.HCPhysInterPaePML4 & PAGE_OFFSET_MASK) && pVM->pgm.s.HCPhysInterPaePML4 < 0xffffffff);
 
     /*

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

@@ -171 +171 @@
     if (CPUMIsGuestInLongModeEx(pCtx))
     {
-        /* Save/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 | CPUM_USED_FPU | CPUM_USED_FPU_SINCE_REM;
-        /** @todo who is saving the host state??  */
+        /* Save the host state and record the fact (CPUM_USED_FPU | CPUM_USED_FPU_SINCE_REM). */
+        cpumR0SaveHostFPUState(&pVCpu->cpum.s);
+
+        /* 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;
     }
     else
@@ -263 +265 @@
     }
 
-    pVCpu->cpum.s.fUseFlags |= CPUM_USED_FPU | CPUM_USED_FPU_SINCE_REM; /** @todo clean up, this is done above by the ASM worker. */
+    Assert(pVCpu->cpum.s.fUseFlags & (CPUM_USED_FPU | CPUM_USED_FPU_SINCE_REM) == (CPUM_USED_FPU | CPUM_USED_FPU_SINCE_REM));
     return VINF_SUCCESS;
 }
@@ -286 +288 @@
     {
         if (!(pVCpu->cpum.s.fUseFlags & CPUM_SYNC_FPU_STATE))
+        {
             HWACCMR0SaveFPUState(pVM, pVCpu, pCtx);
-        cpumR0RestoreHostFPUState(&pVCpu->cpum.s);
+            cpumR0RestoreHostFPUState(&pVCpu->cpum.s);
+        }
+        /* else nothing to do; we didn't perform a world switch */
     }
     else

trunk/src/VBox/VMM/VMMR0/CPUMR0A.asm

@@ -66 +66 @@
 
 ;;
-; Saves the guest FPU/XMM state and restores the host one.
+; Saves the host FPU/XMM state and restores the guest state.
 ;
 ; @returns  0
@@ -99 +99 @@
 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
 
-    fxsave  [xDX + CPUMCPU.Host.fpu]    ; ASSUMES that all VT-x/AMD-V boxes sports fxsave/fxrstor
+    fxsave  [xDX + CPUMCPU.Host.fpu]    ; ASSUMES that all VT-x/AMD-V boxes sports fxsave/fxrstor (safe assumption)
     fxrstor [xDX + CPUMCPU.Guest.fpu]
 
@@ -122 +122 @@
 ENDPROC   cpumR0SaveHostRestoreGuestFPUState
 
-
-;;
-; Saves the guest FPU/XMM state and restores the host one.
+%ifndef RT_ARCH_AMD64
+%ifdef  VBOX_WITH_64_BITS_GUESTS
+%ifndef VBOX_WITH_HYBRID_32BIT_KERNEL
+;;
+; Saves the host FPU/XMM state
+;
+; @returns  0
+; @param    pCPUMCPU  x86:[esp+4] GCC:rdi MSC:rcx     CPUMCPU pointer
+;
+align 16
+BEGINPROC cpumR0SaveHostFPUState
+    mov     xDX, dword [esp + 4]
+
+    ; Switch the state.
+    or      dword [xDX + CPUMCPU.fUseFlags], (CPUM_USED_FPU | CPUM_USED_FPU_SINCE_REM)
+
+    mov     xAX, cr0                    ; Make sure its safe to access the FPU state.
+    mov     xCX, xAX                    ; save old CR0
+    and     xAX, ~(X86_CR0_TS | X86_CR0_EM)
+    mov     cr0, xAX                    ;; @todo optimize this.
+
+    fxsave  [xDX + CPUMCPU.Host.fpu]    ; ASSUMES that all VT-x/AMD-V boxes sports fxsave/fxrstor (safe assumption)
+
+    mov     cr0, xCX                    ; and restore old CR0 again ;; @todo optimize this.
+    xor     eax, eax
+    ret
+ENDPROC   cpumR0SaveHostFPUState
+%endif
+%endif
+%endif
+
+;;
+; Saves the guest FPU/XMM state and restores the host state.
 ;
 ; @returns  0
@@ -159 +189 @@
 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
 
-    fxsave  [xDX + CPUMCPU.Guest.fpu]   ; ASSUMES that all VT-x/AMD-V boxes sports fxsave/fxrstor
+    fxsave  [xDX + CPUMCPU.Guest.fpu]   ; ASSUMES that all VT-x/AMD-V boxes sports fxsave/fxrstor (safe assumption)
     fxrstor [xDX + CPUMCPU.Host.fpu]