Changeset 37969 in vbox for trunk/src/VBox

Timestamp:

Jul 14, 2011 2:36:13 PM (13 years ago)

Author:

vboxsync

Message:

AMD64andLegacy.mac: Avoid #GPing in world switcher code when restoring CR4.PCIDE.

File:

• trunk/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac (modified) (1 diff)

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

@@ -1102 +1102 @@
     ; the fpu stuff must be done before we restore cr0.
     mov     rcx, [rdx + r8 + CPUMCPU.Host.cr4]
+    test    rcx, X86_CR4_PCIDE
+    jz      gth_no_pcide
+    mov     rax, [rdx + r8 + CPUMCPU.Host.cr3]
+    and     rax, ~0xfff                 ; clear the PCID in cr3
+    mov     cr3, rax
     mov     cr4, rcx
+    mov     rax, [rdx + r8 + CPUMCPU.Host.cr3]
+    mov     cr3, rax                    ; reload it with the right PCID.
+    jmp     gth_restored_cr4
+gth_no_pcide:
+    mov     cr4, rcx
+gth_restored_cr4:
     mov     rcx, [rdx + r8 + CPUMCPU.Host.cr0]
     mov     cr0, rcx