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

Timestamp:

Dec 4, 2008 3:39:41 PM (16 years ago)

Author:

vboxsync

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

40364

Message:

Switcher updates

File:

• trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac (modified) (3 diffs)

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

@@ -136 +136 @@
     pop     dword [edx + CPUMCPU.Host.eflags]
 
-    ;; handle use flags.
-    mov     esi, [edx + CPUMCPU.fUseFlags] ; esi == use flags.
-    and     esi, ~CPUM_USED_FPU         ; Clear CPUM_USED_* flags. ;;@todo FPU check can be optimized to use cr0 flags!
-    mov     [edx + CPUMCPU.fUseFlags], esi
-
     ; control registers.
     mov     eax, cr0
@@ -240 +235 @@
     mov     ds, rax
     mov     es, rax
-   
+
     ; Setup stack; use the lss_esp, ss pair for lss
     DEBUG_CHAR('7')
@@ -248 +243 @@
     lss     esp, [rdx + CPUM.Hyper.lss_esp]
 
-    ; call the hypervisor function with rdx=pCpumCpu
-    mov     eax, [rdx + CPUM.Hyper.eip]
+    ; load the hypervisor function address
+    mov     r9, [rdx + CPUM.Hyper.eip]
+
     CPUMCPU_FROM_CPUM(edx)
+    
+    ; Check if we need to restore the guest FPU state
+    mov     esi, [rdx + CPUMCPU.fUseFlags] ; esi == use flags.
+    test    esi, CPUM_SYNC_FPU_STATE
+    jz      near gth_fpu_no  
+
+    mov     rax, cr0
+    mov     rcx, rax                    ; save old CR0
+    and     rax, ~(X86_CR0_TS | X86_CR0_EM)
+    mov     cr0, rax
+    fxrstor [rdx + CPUMCPU.Guest.fpu]
+    mov     cr0, rcx                    ; and restore old CR0 again
+
+gth_fpu_no:
+    ; Check if we need to restore the guest debug state
+    test    esi, CPUM_SYNC_DEBUG_STATE
+    jz      near gth_debug_no
+    
+    mov rax, qword [rdx + CPUMCPU.Guest.dr + 0*8]
+    mov dr0, rax
+    mov rax, qword [rdx + CPUMCPU.Guest.dr + 1*8]
+    mov dr1, rax
+    mov rax, qword [rdx + CPUMCPU.Guest.dr + 2*8]
+    mov dr2, rax
+    mov rax, qword [rdx + CPUMCPU.Guest.dr + 3*8]
+    mov dr3, rax
+    mov rax, qword [rdx + CPUMCPU.Guest.dr + 6*8]
+    mov dr6, rax    ; not required for AMD-V
+
+gth_debug_no:
 
     ; parameter for all helper functions (pCtx)    
     lea     rsi, [rdx + CPUMCPU.Guest.fpu]
-    call    rax
+    call    r9
     
     ; Load CPUM pointer into rdx