Changeset 14900 in vbox for trunk/src

Timestamp:

Dec 2, 2008 1:30:52 PM (16 years ago)

Author:

vboxsync

Message:

Switcher updates

Location:

trunk/src/VBox/VMM

Files:

• VMMGC/HWACCMGCA.asm (modified) (13 diffs)
• VMMSwitcher/LegacyandAMD64.mac (modified) (1 diff)

trunk/src/VBox/VMM/VMMGC/HWACCMGCA.asm

@@ -63 +63 @@
 ; @param 2  16-bit regsiter name for \a 1.
 
-  ; Save a host and load the corresponding guest MSR (trashes rdx & rcx)
+  ; Load the corresponding guest MSR (trashes rdx & rcx)
   %macro LOADGUESTMSR 2
-    mov     rcx, %1
-    rdmsr
-    push    rdx
-    push    rax
     mov     edx, dword [rsi + %2 + 4]
     mov     eax, dword [rsi + %2]
@@ -81 +77 @@
     mov     dword [rsi + %2], eax
     mov     dword [rsi + %2 + 4], edx
-    pop     rax
-    pop     rdx
-    wrmsr
-  %endmacro
-
-  ; Load the corresponding host MSR (trashes rdx & rcx)
-  %macro LOADHOSTMSR 1
-    mov     rcx, %1
-    pop     rax
-    pop     rdx
-    wrmsr
   %endmacro
 
@@ -185 +170 @@
 ; *
 ; * @returns VBox status code
-; * @param   fResume    vmlauch/vmresume
 ; * @param   pCtx       Guest context
 ; */
@@ -219 +203 @@
 
     ;/* Save the Guest CPU context pointer. */
-%ifdef ASM_CALL64_GCC
-    ; fResume already in rdi
     ; pCtx    already in rsi
-%else
-    mov     rdi, rcx        ; fResume
-    mov     rsi, rdx        ; pCtx
-%endif
 
     ;/* Save segment registers */
@@ -233 +211 @@
     ; Save the host LSTAR, CSTAR, SFMASK & KERNEL_GSBASE MSRs and restore the guest MSRs
     ;; @todo use the automatic load feature for MSRs
-    LOADGUESTMSR MSR_K8_LSTAR, CPUMCTX.msrLSTAR
-%if 0  ; not supported on Intel CPUs
-    LOADGUESTMSR MSR_K8_CSTAR, CPUMCTX.msrCSTAR
-%endif
-    LOADGUESTMSR MSR_K6_STAR, CPUMCTX.msrSTAR
-    LOADGUESTMSR MSR_K8_SF_MASK, CPUMCTX.msrSFMASK
+    LOADGUESTMSR MSR_K8_LSTAR,          CPUMCTX.msrLSTAR
+    LOADGUESTMSR MSR_K6_STAR,           CPUMCTX.msrSTAR
+    LOADGUESTMSR MSR_K8_SF_MASK,        CPUMCTX.msrSFMASK
     LOADGUESTMSR MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
 
@@ -280 +255 @@
     mov     r15, qword [rsi + CPUMCTX.r15]
 
-    ; resume or start?
-    cmp     rdi, 0                  ; fResume
-    je      .vmlauch64_lauch
-
-    ;/* Restore edi & esi. */
-    mov     rdi, qword [rsi + CPUMCTX.edi]
-    mov     rsi, qword [rsi + CPUMCTX.esi]
-
-    vmresume
-    jmp     .vmlaunch64_done;      ;/* here if vmresume detected a failure. */
-
-.vmlauch64_lauch:
     ;/* Restore rdi & rsi. */
     mov     rdi, qword [rsi + CPUMCTX.edi]
@@ -301 +264 @@
 ALIGNCODE(16)
 .vmlaunch64_done:
-    jc      near .vm8tart64_invalid_vmxon_ptr
-    jz      near .vm8tart64_start_failed
+    jc      near .vmstart64_invalid_vmxon_ptr
+    jz      near .vmstart64_start_failed
 
     ; Restore base and limit of the IDTR & GDTR
@@ -339 +302 @@
     ;; @todo use the automatic load feature for MSRs
     LOADHOSTMSREX MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
-    LOADHOSTMSR MSR_K8_SF_MASK
-    LOADHOSTMSR MSR_K6_STAR
-%if 0  ; not supported on Intel CPUs
-    LOADHOSTMSR MSR_K8_CSTAR
-%endif
-    LOADHOSTMSR MSR_K8_LSTAR
 
     ; Restore segment registers
@@ -360 +317 @@
 
 
-.vm8tart64_invalid_vmxon_ptr:
+.vmstart64_invalid_vmxon_ptr:
     ; Restore base and limit of the IDTR & GDTR
     lidt    [rsp]
@@ -375 +332 @@
     ;; @todo use the automatic load feature for MSRs
     LOADHOSTMSREX MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
-    LOADHOSTMSR MSR_K8_SF_MASK
-    LOADHOSTMSR MSR_K6_STAR
-%if 0  ; not supported on Intel CPUs
-    LOADHOSTMSR MSR_K8_CSTAR
-%endif
-    LOADHOSTMSR MSR_K8_LSTAR
 
     ; Restore segment registers
@@ -390 +341 @@
     jmp     .vmstart64_end
 
-.vm8tart64_start_failed:
+.vmstart64_start_failed:
     ; Restore base and limit of the IDTR & GDTR
     lidt    [rsp]
@@ -405 +356 @@
     ;; @todo use the automatic load feature for MSRs
     LOADHOSTMSREX MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
-    LOADHOSTMSR MSR_K8_SF_MASK
-    LOADHOSTMSR MSR_K6_STAR
-%if 0  ; not supported on Intel CPUs
-    LOADHOSTMSR MSR_K8_CSTAR
-%endif
-    LOADHOSTMSR MSR_K8_LSTAR
 
     ; Restore segment registers
@@ -542 +487 @@
 ENDPROC SVMGCVMRun64
 
+;/**
+; * Saves the guest FPU context
+; *
+; * @returns VBox status code
+; * @param   pCtx       Guest context [rsi]
+; */
 BEGINPROC HWACCMSaveGuestFPU64
+    mov     rax, cr0
+    mov     rcx, rax                    ; save old CR0
+    and     rax, ~(X86_CR0_TS | X86_CR0_EM)
+    mov     cr0, rax
+
+    fxsave  [rsi + CPUMCTX.fpu]
+
+    mov     cr0, rcx                    ; and restore old CR0 again
+    
+    mov     eax, VINF_SUCCESS
     ret
 ENDPROC HWACCMSaveGuestFPU64
 
+;/**
+; * Saves the guest debug context (DR0-3, DR6)
+; *
+; * @returns VBox status code
+; * @param   pCtx       Guest context [rsi]
+; */
 BEGINPROC HWACCMSaveGuestDebug64
+    mov rax, dr0
+    mov qword [rsi + CPUMCTX.dr + 0*8], rax
+    mov rax, dr1
+    mov qword [rsi + CPUMCTX.dr + 1*8], rax
+    mov rax, dr2
+    mov qword [rsi + CPUMCTX.dr + 2*8], rax
+    mov rax, dr3
+    mov qword [rsi + CPUMCTX.dr + 3*8], rax
+    mov rax, dr6
+    mov qword [rsi + CPUMCTX.dr + 6*8], rax
+    mov eax, VINF_SUCCESS
     ret
 ENDPROC HWACCMSaveGuestDebug64
 
+;/**
+; * Dummy callback handler
+; *
+; * @returns VBox status code
+; * @param   pCtx       Guest context [rsi]
+; */
 BEGINPROC HWACCMTestSwitcher64
+    mov eax, VINF_SUCCESS
     ret
 ENDPROC HWACCMTestSwitcher64

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

@@ -430 +430 @@
     lss     esp, [edx + CPUMCPU.Host.esp]
 
-    ; Restore FPU if guest has used it.
-    ; Using fxrstor should ensure that we're not causing unwanted exception on the host.
-    mov     esi, [edx + CPUMCPU.fUseFlags] ; esi == use flags.
-    test    esi, CPUM_USED_FPU
-    jz near gth_fpu_no
-    mov     ecx, cr0
-    and     ecx, ~(X86_CR0_TS | X86_CR0_EM)
-    mov     cr0, ecx
-
-    fxsave  [edx + CPUMCPU.Guest.fpu]
-    fxrstor [edx + CPUMCPU.Host.fpu]
-    jmp near gth_fpu_no
-
-ALIGNCODE(16)
-gth_fpu_no:
-
     ; Control registers.
-    ; Would've liked to have these higher up in case of crashes, but
-    ; the fpu stuff must be done before we restore cr0.
     mov     ecx, [edx + CPUMCPU.Host.cr4]
     mov     cr4, ecx