Changeset 61162 in vbox for trunk/src/VBox

Timestamp:

May 24, 2016 12:49:54 PM (9 years ago)

Author:

vboxsync

Message:

CPUMInternal.mac: Apply FPUCS/DS hack to xsave just like we already do for fxsave. Kudos to quentin buathier for this fix.

File:

• trunk/src/VBox/VMM/include/CPUMInternal.mac (modified) (7 diffs)

trunk/src/VBox/VMM/include/CPUMInternal.mac

@@ -713 +713 @@
 
 
-;; Macro for FXSAVE for the guest FPU but tries to figure out whether to
+;; Macro for XSAVE/FXSAVE for the guest FPU but tries to figure out whether to
 ;  save the 32-bit FPU state or 64-bit FPU state.
 ;
@@ -719 +719 @@
 ; @param    %2      Pointer to XState.
 ; @param    %3      Force AMD64
+; @param    %4      The instruction to use (xsave or fxsave)
 ; @uses     xAX, xDX, EFLAGS, 20h of stack.
 ;
-%macro SAVE_32_OR_64_FPU 3
+%macro SAVE_32_OR_64_FPU 4
 %if CPUM_IS_AMD64 || %3
         ; Save the guest FPU (32-bit or 64-bit), preserves existing broken state. See @bugref{7138}.
@@ -727 +728 @@
         jnz     short %%save_long_mode_guest
 %endif
-        fxsave  [pXState]
+        %4      [pXState]
 %if CPUM_IS_AMD64 || %3
         jmp     %%save_done_32bit_cs_ds
 
 %%save_long_mode_guest:
-        o64 fxsave [pXState]
+        o64 %4  [pXState]
 
         xor     edx, edx
@@ -784 +785 @@
         and     eax, ~CPUM_VOLATILE_XSAVE_GUEST_COMPONENTS ; Already saved in HMR0A.asm.
  %endif
- %ifdef RT_ARCH_AMD64
-        o64 xsave [pXState]
- %else
-        xsave   [pXState]
- %endif
+        SAVE_32_OR_64_FPU pCpumCpu, pXState, 0, xsave
         jmp     %%guest_done
 
         ; FXSAVE
 %%guest_fxsave:
-        SAVE_32_OR_64_FPU pCpumCpu, pXState, 0
+        SAVE_32_OR_64_FPU pCpumCpu, pXState, 0, fxsave
 
 %%guest_done:
@@ -800 +797 @@
 
 ;;
-; Wrapper for selecting 32-bit or 64-bit FXRSTOR according to what SAVE_32_OR_64_FPU did.
+; Wrapper for selecting 32-bit or 64-bit XRSTOR/FXRSTOR according to what SAVE_32_OR_64_FPU did.
 ;
 ; @param    %1      Pointer to CPUMCPU.
 ; @param    %2      Pointer to XState.
 ; @param    %3      Force AMD64.
+; @param    %4      The instruction to use (xrstor or fxrstor).
 ; @uses     xAX, xDX, EFLAGS
 ;
-%macro RESTORE_32_OR_64_FPU 3
+%macro RESTORE_32_OR_64_FPU 4
 %if CPUM_IS_AMD64 || %3
         ; Restore the guest FPU (32-bit or 64-bit), preserves existing broken state. See @bugref{7138}.
@@ -816 +814 @@
 %%restore_32bit_fpu:
 %endif
-        fxrstor [pXState]
+        %4      [pXState]
 %if CPUM_IS_AMD64 || %3
         ; TODO: Restore XMM8-XMM15!
         jmp     short %%restore_fpu_done
 %%restore_64bit_fpu:
-        o64 fxrstor [pXState]
+        o64 %4  [pXState]
 %%restore_fpu_done:
 %endif
@@ -858 +856 @@
         and     eax, ~CPUM_VOLATILE_XSAVE_GUEST_COMPONENTS ; Will be loaded by HMR0A.asm.
  %endif
- %ifdef RT_ARCH_AMD64
-        o64 xrstor [pXState]
- %else
-        xrstor  [pXState]
- %endif
+        RESTORE_32_OR_64_FPU pCpumCpu, pXState, 0, xrstor
         jmp     %%guest_done
 
         ; FXRSTOR
 %%guest_fxrstor:
-        RESTORE_32_OR_64_FPU pCpumCpu, pXState, 0
+        RESTORE_32_OR_64_FPU pCpumCpu, pXState, 0, fxrstor
 
 %%guest_done: