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

Timestamp:

May 27, 2008 1:56:46 PM (17 years ago)

Author:

vboxsync

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

31299

Message:

Have to save and restore MSR_K8_FS_BASE as well in the VMXStartVM/VMXResumeVM calls (MSR_K8_GS_BASE was already preserved). This fixes a crash upon returning to user land in the solaris pthreads code.

File:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm

@@ -107 +107 @@
     mov     %2, ds
     push    %1
+
+    ; Special case for FS; Windows and Linux either don't use it or restore it when leaving kernel mode, Solaris OTOH doesn't and we must save it.
+    push    rcx
+    mov     ecx, MSR_K8_FS_BASE
+    rdmsr
+    pop     rcx
+    push    rdx
+    push    rax
     push    fs
+
     ; Special case for GS; OSes typically use swapgs to reset the hidden base register for GS on entry into the kernel. The same happens on exit
     push    rcx
@@ -127 +136 @@
     wrmsr
     pop     rcx
+
+    pop     fs
+    pop     rax
+    pop     rdx
+    push    rcx
+    mov     ecx, MSR_K8_FS_BASE
+    wrmsr
+    pop     rcx
     ; Now it's safe to step again
 
-    pop     fs
     pop     %1
     mov     ds, %2