Changeset 9815 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jun 19, 2008 11:14:38 AM (17 years ago)

Author:

vboxsync

Message:

Removed unnecessary guest msr saving.

File:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm

@@ -77 +77 @@
 
   ; Save a guest and load the corresponding host MSR (trashes rdx & rcx)
-  %macro LOADHOSTMSR 2
+  %macro LOADHOSTMSR 1
     mov     rcx, %1
-    rdmsr
-    mov     qword [xSI + %2], rax
     pop     rax
     pop     rdx
@@ -575 +573 @@
     pop     xSI         ; pCtx (needed in rsi by the macros below)
 
-    ; Save the guest LSTAR, CSTAR, SFMASK & KERNEL_GSBASE MSRs and restore the host MSRs
+    ; Restore the host LSTAR, CSTAR, SFMASK & KERNEL_GSBASE MSRs
     ; @todo use the automatic load feature for MSRs
-    LOADHOSTMSR MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
-    LOADHOSTMSR MSR_K8_SF_MASK, CPUMCTX.msrSFMASK
-    LOADHOSTMSR MSR_K8_CSTAR, CPUMCTX.msrCSTAR
-    LOADHOSTMSR MSR_K8_LSTAR, CPUMCTX.msrLSTAR
+    LOADHOSTMSR MSR_K8_KERNEL_GS_BASE
+    LOADHOSTMSR MSR_K8_SF_MASK
+    LOADHOSTMSR MSR_K8_CSTAR
+    LOADHOSTMSR MSR_K8_LSTAR
 
     ; Restore segment registers
@@ -608 +606 @@
     pop     xSI         ; pCtx (needed in rsi by the macros below)
 
-    ; Save the guest LSTAR, CSTAR, SFMASK & KERNEL_GSBASE MSRs and restore the host MSRs
+    ; Restore the host LSTAR, CSTAR, SFMASK & KERNEL_GSBASE MSRs
     ; @todo use the automatic load feature for MSRs
-    LOADHOSTMSR MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
-    LOADHOSTMSR MSR_K8_SF_MASK, CPUMCTX.msrSFMASK
-    LOADHOSTMSR MSR_K8_CSTAR, CPUMCTX.msrCSTAR
-    LOADHOSTMSR MSR_K8_LSTAR, CPUMCTX.msrLSTAR
+    LOADHOSTMSR MSR_K8_KERNEL_GS_BASE
+    LOADHOSTMSR MSR_K8_SF_MASK
+    LOADHOSTMSR MSR_K8_CSTAR
+    LOADHOSTMSR MSR_K8_LSTAR
 
     ; Restore segment registers
@@ -635 +633 @@
     pop     xSI         ; pCtx (needed in rsi by the macros below)
 
-    ; Save the guest LSTAR, CSTAR, SFMASK & KERNEL_GSBASE MSRs and restore the host MSRs
+    ; Restore the host LSTAR, CSTAR, SFMASK & KERNEL_GSBASE MSRs
     ; @todo use the automatic load feature for MSRs
-    LOADHOSTMSR MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
-    LOADHOSTMSR MSR_K8_SF_MASK, CPUMCTX.msrSFMASK
-    LOADHOSTMSR MSR_K8_CSTAR, CPUMCTX.msrCSTAR
-    LOADHOSTMSR MSR_K8_LSTAR, CPUMCTX.msrLSTAR
+    LOADHOSTMSR MSR_K8_KERNEL_GS_BASE
+    LOADHOSTMSR MSR_K8_SF_MASK
+    LOADHOSTMSR MSR_K8_CSTAR
+    LOADHOSTMSR MSR_K8_LSTAR
 
     ; Restore segment registers