Changeset 48638 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 23, 2013 2:02:29 PM (11 years ago)

Author:

vboxsync

Message:

VMM/CPUMAllA.asm: Don't forget restoring host CR0 when swapping FPU states during #NMs in ring-0.

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllA.asm (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/CPUMAllA.asm

@@ -161 +161 @@
     ; Use explicit REX prefix. See @bugref{6398}.
     o64 fxsave  [xDX + CPUMCPU.Host.fpu]
+    o64 fxrstor [xDX + CPUMCPU.Guest.fpu]
 %else
     fxsave  [xDX + CPUMCPU.Host.fpu]
-%endif
+    fxrstor [xDX + CPUMCPU.Guest.fpu]
+%endif
+    ; We've loaded the guest FPU now
     or      dword [xDX + CPUMCPU.fUseFlags], (CPUM_USED_FPU | CPUM_USED_FPU_SINCE_REM)
-%ifdef RT_ARCH_AMD64
-    o64 fxrstor [xDX + CPUMCPU.Guest.fpu]
-%else
-    fxrstor [xDX + CPUMCPU.Guest.fpu]
-%endif
 hlfpua_finished_switch:
-%ifdef IN_RC
+%ifndef IN_RING3 ; IN_RC or IN_RING0
     mov     cr0, xCX                            ; load the new cr0 flags.
 %endif