Changeset 54898 in vbox for trunk/src/VBox/VMM/VMMSwitcher

Timestamp:

Mar 22, 2015 11:47:07 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99113

Message:

CPUMCTX,CPUMHOST: Replaced the fpu (X86FXSAVE) member with an XState (X86XSAVEAREA) member.

Location:

trunk/src/VBox/VMM/VMMSwitcher

Files:

• AMD64andLegacy.mac (modified) (1 diff)
• LegacyandAMD64.mac (modified) (3 diffs)
• PAEand32Bit.mac (modified) (1 diff)

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

@@ -1144 +1144 @@
     mov     cr0, rcx
 
-    fxsave  [rdx + r8 + CPUMCPU.Guest.fpu]
-    o64 fxrstor [rdx + r8 + CPUMCPU.Host.fpu]       ; Restore 64-bit host FPU state. See @bugref{7138}
+    fxsave  [rdx + r8 + CPUMCPU.Guest.XState]
+    o64 fxrstor [rdx + r8 + CPUMCPU.Host.XState]    ; Restore 64-bit host FPU state. See @bugref{7138}
     jmp short gth_fpu_no
 

trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac ¶

@@ -665 +665 @@
     mov     cr0, rax
     ; Use explicit REX prefix. See @bugref{6398}.
-    o64 fxrstor [rdx + CPUMCPU.Guest.fpu]
+    o64 fxrstor [rdx + CPUMCPU.Guest.XState]
     mov     cr0, rcx                    ; and restore old CR0 again
 
@@ -725 +725 @@
     ; parameter for all helper functions (pCtx)
     DEBUG64_CHAR('9')
-    lea     rsi, [rdx + CPUMCPU.Guest.fpu]
+    lea     rsi, [rdx + CPUMCPU.Guest.XState]
     lea     rax, [htg_return wrt rip]
     push    rax                         ; return address
@@ -1259 +1259 @@
 
     ; Use explicit REX prefix. See @bugref{6398}.
-    o64 fxsave  [rsi + CPUMCTX.fpu]
+    o64 fxsave  [rsi + CPUMCTX.XState]
 
     mov     cr0, rcx                    ; and restore old CR0 again

trunk/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac ¶

@@ -991 +991 @@
 
     FIXUP FIX_NO_FXSAVE_JMP, 0, gth_no_fxsave - NAME(Start) ; this will insert a jmp gth_no_fxsave if fxsave isn't supported.
-    fxsave  [edx + CPUMCPU.Guest.fpu]
-    fxrstor [edx + CPUMCPU.Host.fpu]
+    fxsave  [edx + CPUMCPU.Guest.XState]
+    fxrstor [edx + CPUMCPU.Host.XState]
     jmp near gth_fpu_no
 
 gth_no_fxsave:
-    fnsave  [edx + CPUMCPU.Guest.fpu]
-    mov     eax, [edx + CPUMCPU.Host.fpu]     ; control word
+    fnsave  [edx + CPUMCPU.Guest.XState]
+    mov     eax, [edx + CPUMCPU.Host.XState] ; control word
     not     eax                            ; 1 means exception ignored (6 LS bits)
     and     eax, byte 03Fh                 ; 6 LS bits only
-    test    eax, [edx + CPUMCPU.Host.fpu + 4] ; status word
+    test    eax, [edx + CPUMCPU.Host.XState + 4] ; status word
     jz      gth_no_exceptions_pending
 
     ; technically incorrect, but we certainly don't want any exceptions now!!
-    and     dword [edx + CPUMCPU.Host.fpu + 4], ~03Fh
+    and     dword [edx + CPUMCPU.Host.XState + 4], ~03Fh
 
 gth_no_exceptions_pending:
-    frstor  [edx + CPUMCPU.Host.fpu]
+    frstor  [edx + CPUMCPU.Host.XState]
     jmp short gth_fpu_no