Changeset 20535 in vbox for trunk/src/VBox

Timestamp:

Jun 13, 2009 8:58:29 PM (16 years ago)

Author:

vboxsync

Message:

CPUMR0A.asm: must disable interrupt while messing with CR0 on darwin.

File:

• trunk/src/VBox/VMM/VMMR0/CPUMR0A.asm (modified) (6 diffs)

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

@@ -82 +82 @@
     mov     xDX, dword [esp + 4]
 %endif
+    pushf                               ; The darwin kernel can get upset or upset things if an
+    cli                                 ; interrupt occurs while we're doing fxsave/fxrstor/cr0.
 
     ; Switch the state.
@@ -104 +106 @@
 .done:
     mov     cr0, xCX                    ; and restore old CR0 again ;; @todo optimize this.
-.fpu_not_used:
+    popf
     xor     eax, eax
     ret
@@ -176 +178 @@
     jz short .fpu_not_used
 
+    pushf                               ; The darwin kernel can get upset or upset things if an
+    cli                                 ; interrupt occurs while we're doing fxsave/fxrstor/cr0.
+
     mov     xAX, cr0                    ; Make sure it's safe to access the FPU state.
     mov     xCX, xAX                    ; save old CR0
@@ -195 +200 @@
     mov     cr0, xCX                    ; and restore old CR0 again ;; @todo optimize this.
     and     dword [xDX + CPUMCPU.fUseFlags], ~CPUM_USED_FPU
+    popf
 .fpu_not_used:
     xor     eax, eax
@@ -237 +243 @@
     jz short .fpu_not_used
 
+    pushf                               ; The darwin kernel can get upset or upset things if an
+    cli                                 ; interrupt occurs while we're doing fxsave/fxrstor/cr0.
+
     mov     xAX, cr0
     mov     xCX, xAX                    ; save old CR0
@@ -255 +264 @@
     mov     cr0, xCX                    ; and restore old CR0 again
     and     dword [xDX + CPUMCPU.fUseFlags], ~CPUM_USED_FPU
+    popf
 .fpu_not_used:
     xor     eax, eax