Changeset 61058 in vbox for trunk/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac

Timestamp:

May 19, 2016 7:12:56 PM (9 years ago)

Author:

vboxsync

Message:

CPUM,++: Split up CPUM_USED_FPU into CPUM_USED_FPU_GUEST & CPUM_USED_FPU_HOST.

File:

• trunk/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac (modified) (4 diffs)

trunk/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac

@@ -454 +454 @@
     ;; handle use flags.
     mov     esi, [rdx + r8 + CPUMCPU.fUseFlags] ; esi == use flags.
-    and     esi, ~CPUM_USED_FPU   ; Clear CPUM_USED_* flags. ;;@todo FPU check can be optimized to use cr0 flags!
+    and     esi, ~(CPUM_USED_FPU_GUEST | CPUM_USED_FPU_HOST) ; Clear CPUM_USED_* flags.
     mov     [rdx + r8 + CPUMCPU.fUseFlags], esi
 
@@ -1064 +1064 @@
     ; Using fxrstor should ensure that we're not causing unwanted exception on the host.
     mov     esi, [rdx + r8 + CPUMCPU.fUseFlags] ; esi == use flags.
-    test    esi, CPUM_USED_FPU
+    test    esi, (CPUM_USED_FPU_GUEST | CPUM_USED_FPU_HOST)
     jz      gth_fpu_no
     mov     rcx, cr0
@@ -1072 +1072 @@
     mov     r10, rdx                    ; Save rdx.
 
+    test    esi, CPUM_USED_FPU_GUEST
+    jz      gth_fpu_host
+
     mov     eax, [r10 + r8 + CPUMCPU.Guest.fXStateMask]
-    mov     r9, [r10 + r8 + CPUMCPU.Guest.pXStateR0]
+    mov     r9,  [r10 + r8 + CPUMCPU.Guest.pXStateR0]
     or      eax, eax
     jz      gth_fpu_guest_fxsave
@@ -1084 +1087 @@
 gth_fpu_host:
     mov     eax, [r10 + r8 + CPUMCPU.Host.fXStateMask]
-    mov     r9, [r10 + r8 + CPUMCPU.Host.pXStateR0]
+    mov     r9,  [r10 + r8 + CPUMCPU.Host.pXStateR0]
     or      eax, eax
     jz      gth_fpu_host_fxrstor