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

Timestamp:

Sep 19, 2013 3:43:50 PM (11 years ago)

Author:

vboxsync

Message:

VMM/CPUMR0A.asm: Yasm requires explicit REX prefix for fxsave/rstor. Don't corrupt the FPU state for 64-bit guests.

File:

• trunk/src/VBox/VMM/VMMR0/CPUMR0A.asm (modified) (3 diffs)

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

@@ -245 +245 @@
 .sixtyfourbit_mode:
     and     edx, 0ffffffffh
-    fxsave  [rdx + CPUMCPU.Guest.fpu]
-    fxrstor [rdx + CPUMCPU.Host.fpu]
+    o64 fxsave  [rdx + CPUMCPU.Guest.fpu]
+    o64 fxrstor [rdx + CPUMCPU.Host.fpu]
     jmp far [.fpret wrt rip]
 .fpret:                                 ; 16:32 Pointer to .the_end.
@@ -294 +294 @@
 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
 
+%ifdef RT_ARCH_AMD64
+    o64 fxrstor [xDX + CPUMCPU.Host.fpu]
+%else
     fxrstor [xDX + CPUMCPU.Host.fpu]
+%endif
 
 .done:
@@ -309 +313 @@
 .sixtyfourbit_mode:
     and     edx, 0ffffffffh
-    fxrstor [rdx + CPUMCPU.Host.fpu]
+    o64 fxrstor [rdx + CPUMCPU.Host.fpu]
     jmp far [.fpret wrt rip]
 .fpret:                                 ; 16:32 Pointer to .the_end.