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

Timestamp:

Aug 3, 2009 2:39:00 PM (16 years ago)

Author:

vboxsync

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

50627

Message:

VMM: detect syscall usage on the host.

File:

• trunk/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac (modified) (5 diffs)

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

@@ -157 +157 @@
 htg_no_sysenter:
 
+    FIXUP FIX_NO_SYSCALL_JMP, 0, htg_no_syscall - NAME(Start) ; this will insert a jmp htg_no_syscall if host doesn't use syscall.
+    ; clear MSR_K6_EFER_SCE.
+    mov     ebx, edx                    ; save edx
+    mov     ecx, MSR_K6_EFER
+    rdmsr                               ; edx:eax <- MSR[ecx]
+    and     eax, ~MSR_K6_EFER_SCE
+    wrmsr
+    mov     edx, ebx                    ; restore edx
+    jmp short htg_no_syscall
+
+ALIGNCODE(16)
+htg_no_syscall:
+
     ;; handle use flags.
     mov     esi, [edx + CPUMCPU.fUseFlags] ; esi == use flags.
@@ -216 +229 @@
     ; Store the hypervisor cr3 for later loading
     mov     ebp, [edx + CPUMCPU.Hyper.cr3]
-    
+
     ;;
     ;; Load Intermediate memory context.
@@ -381 +394 @@
     ; callees expect CPUM ptr
     CPUM_FROM_CPUMCPU(edx)
-    
+
 %ifdef VBOX_WITH_STATISTICS
     FIXUP FIX_GC_VM_OFF, 1, VM.StatSwitcherToGC
@@ -420 +433 @@
     mov     eax, dr3
     mov     [edx + CPUMCPU.Host.dr3], eax
-    
+
     ; load hyper DR0-7
     mov     ebx, [edx + CPUMCPU.Hyper.dr]
@@ -864 +877 @@
 gth_sysenter_no:
 
-    ;; @todo AMD syscall
+    FIXUP FIX_NO_SYSCALL_JMP, 0, gth_syscall_no - NAME(Start) ; this will insert a jmp gth_syscall_no if host doesn't use syscall.
+    ; set MSR_K6_EFER_SCE.
+    mov     ebx, edx                    ; save edx
+    mov     ecx, MSR_K6_EFER
+    rdmsr
+    or      eax, MSR_K6_EFER_SCE
+    wrmsr
+    mov     edx, ebx                    ; restore edx
+    jmp short gth_syscall_no
+
+ALIGNCODE(16)
+gth_syscall_no:
 
     ; Restore FPU if guest has used it.