Changeset 22079 in vbox for trunk/src/VBox/VMM/VMMGC

Timestamp:

Aug 7, 2009 4:26:25 PM (15 years ago)

Author:

vboxsync

Message:

Back to manual msr save and restore.

File:

• trunk/src/VBox/VMM/VMMGC/HWACCMGCA.asm (modified) (2 diffs)

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

@@ -232 +232 @@
     ; *
     ; */
+
+    ; Load the guest LSTAR, CSTAR, SFMASK & KERNEL_GSBASE 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_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
+
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
     mov     qword [rbx + VMCSCACHE.uPos], 5
@@ -297 +308 @@
 
     pop     rsi         ; pCtx (needed in rsi by the macros below)
+
+    ;; @todo use the automatic load feature for MSRs
+    SAVEGUESTMSR MSR_K8_LSTAR,          CPUMCTX.msrLSTAR
+%if 0  ; not supported on Intel CPUs
+    SAVEGUESTMSR MSR_K8_CSTAR,          CPUMCTX.msrCSTAR
+%endif
+    SAVEGUESTMSR MSR_K6_STAR,           CPUMCTX.msrSTAR
+    SAVEGUESTMSR MSR_K8_SF_MASK,        CPUMCTX.msrSFMASK
+    SAVEGUESTMSR MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
 
 %ifdef VMX_USE_CACHED_VMCS_ACCESSES