Changeset 15563 in vbox for trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac

Timestamp:

Dec 16, 2008 9:25:08 AM (16 years ago)

Author:

vboxsync

Message:

Save and restore the host's EFER msr in the 32->64 switcher.

File:

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

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

@@ -145 +145 @@
     mov     [edx + CPUMCPU.Host.cr4], eax
 
+    ; save the host EFER msr
+    mov     ebx, edx
+    mov     ecx, MSR_K6_EFER
+    rdmsr
+    mov     [ebx + CPUMCPU.Host.efer], eax
+    mov     [ebx + CPUMCPU.Host.efer + 4], edx
+    mov     edx, ebx
+
     CPUM_FROM_CPUMCPU(edx)
     ; Load new gdt so we can do a far jump after going into 64 bits mode
@@ -440 +448 @@
     CPUMCPU_FROM_CPUM(edx)
 
-       
+    ; restore the host EFER
+    mov     ebx, edx
+    mov     ecx, MSR_K6_EFER
+    mov     eax, [ebx + CPUMCPU.Host.efer]
+    mov     edx, [ebx + CPUMCPU.Host.efer + 4]
+    wrmsr
+    mov     edx, ebx
+    
     ; activate host gdt and idt
     lgdt    [edx + CPUMCPU.Host.gdtr]