Changeset 21937 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 3, 2009 8:50:47 AM (16 years ago)

Author:

vboxsync

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

50605

Message:

Fixed wrong check for sysenter.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/CPUMR0.cpp (modified) (1 diff)
• VMMSwitcher/AMD64andLegacy.mac (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp

@@ -86 +86 @@
             if (u32)
             {
-                for (unsigned i=0;i<pVM->cCPUs;i++)
-                    pVM->aCpus[i].cpum.s.fUseFlags |= CPUM_USE_SYSENTER;
-
+                pVM->cpum.s.fHostUseFlags |= CPUM_USE_SYSENTER;
                 Log(("CPUMR0Init: host uses sysenter cs=%08x%08x\n", ASMRdMsr_High(MSR_IA32_SYSENTER_CS), u32));
             }

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

@@ -256 +256 @@
     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     rbx, rdx                    ; save edx
     mov     ecx, MSR_IA32_SYSENTER_CS
-    mov     rbx, rdx                    ; save edx
     rdmsr                               ; edx:eax <- MSR[ecx]
-    mov     [rbx + r8 + CPUMCPU.Host.SysEnter.cs], rax
-    mov     [rbx + r8 + CPUMCPU.Host.SysEnter.cs + 4], rdx
-    xor     rax, rax                    ; load 0:0 to cause #GP upon sysenter
-    xor     rdx, rdx
+    mov     [rbx + r8 + CPUMCPU.Host.SysEnter.cs], eax
+    mov     [rbx + r8 + CPUMCPU.Host.SysEnter.cs + 4], edx
+    xor     eax, eax                    ; load 0:0 to cause #GP upon sysenter
+    xor     edx, edx
     wrmsr
     mov     rdx, rbx                    ; restore edx