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

Timestamp:

Nov 28, 2008 9:38:27 AM (16 years ago)

Author:

vboxsync

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

40080

Message:

Switcher updates

File:

• trunk/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm (modified) (4 diffs)

trunk/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm

@@ -138 +138 @@
     pop     dword [edx + CPUMCPU.Host.eflags]
 
-    FIXUP FIX_NO_SYSENTER_JMP, 0, htg_no_sysenter - NAME(Start) ; this will insert a jmp htg_no_sysenter if host doesn't use sysenter.
-    ; save MSR_IA32_SYSENTER_CS register.
-    mov     ecx, MSR_IA32_SYSENTER_CS
-    mov     ebx, edx                    ; save edx
-    rdmsr                               ; edx:eax <- MSR[ecx]
-    mov     [ebx + CPUMCPU.Host.SysEnter.cs], eax
-    mov     [ebx + CPUMCPU.Host.SysEnter.cs + 4], edx
-    xor     eax, eax                    ; load 0:0 to cause #GP upon sysenter
-    xor     edx, edx
-    wrmsr
-    xchg    ebx, edx                    ; restore edx
-    jmp short htg_no_sysenter
-
-ALIGNCODE(16)
-htg_no_sysenter:
-
     ;; handle use flags.
     mov     esi, [edx + CPUMCPU.fUseFlags] ; esi == use flags.
@@ -173 +157 @@
     mov     eax, cr4
     mov     [edx + CPUMCPU.Host.cr4], eax
+
+    CPUM_FROM_CPUMCPU(edx)
+    ; Load new gdt so we can do far jump after going into 64 bits mode
+    lgdt    [edx + CPUM.Hyper.gdtr]
 
     ;;
@@ -438 +426 @@
     lss     esp, [edx + CPUMCPU.Host.esp]
 
-    FIXUP FIX_NO_SYSENTER_JMP, 0, gth_sysenter_no - NAME(Start) ; this will insert a jmp gth_sysenter_no if host doesn't use sysenter.
-    
-    ; restore MSR_IA32_SYSENTER_CS register.
-    mov     ecx, MSR_IA32_SYSENTER_CS
-    mov     eax, [edx + CPUMCPU.Host.SysEnter.cs]
-    mov     ebx, [edx + CPUMCPU.Host.SysEnter.cs + 4]
-    xchg    edx, ebx                    ; save/load edx
-    wrmsr                               ; MSR[ecx] <- edx:eax
-    xchg    edx, ebx                    ; restore edx
-    jmp short gth_sysenter_no
-
-ALIGNCODE(16)
-gth_sysenter_no:
-
-    ;; @todo AMD syscall
-
     ; Restore FPU if guest has used it.
     ; Using fxrstor should ensure that we're not causing unwanted exception on the host.
@@ -487 +459 @@
 
     ; Control registers.
-    ; Would've liked to have these highere up in case of crashes, but
+    ; 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]