Changeset 20540 in vbox for trunk/src

Timestamp:

Jun 13, 2009 9:23:51 PM (16 years ago)

Author:

vboxsync

Message:

CPUMR0A.asm: More pushf;cli ... popf paranoia.

File:

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

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

@@ -124 +124 @@
 ENDPROC   cpumR0SaveHostRestoreGuestFPUState
 
+
 %ifndef RT_ARCH_AMD64
 %ifdef  VBOX_WITH_64_BITS_GUESTS
@@ -136 +137 @@
 BEGINPROC cpumR0SaveHostFPUState
     mov     xDX, dword [esp + 4]
+    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.
@@ -148 +151 @@
 
     mov     cr0, xCX                    ; and restore old CR0 again ;; @todo optimize this.
+    popf
     xor     eax, eax
     ret
@@ -154 +158 @@
 %endif
 %endif
+
 
 ;;
@@ -295 +300 @@
 %else
     mov     xCX, dword [esp + 4]
+%endif
+    pushf                               ; Just to be on the safe side.
+    cli
 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
     cmp     byte [NAME(g_fCPUMIs64bitHost)], 0
@@ -302 +310 @@
 .legacy_mode:
 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
-%endif
 
     ;
@@ -317 +324 @@
 
 .done:
+    popf
     ret
 
@@ -352 +360 @@
 %else
     mov     xCX, dword [esp + 4]
+%endif
+    pushf                               ; Just to be on the safe side.
+    cli
 %ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
     cmp     byte [NAME(g_fCPUMIs64bitHost)], 0
@@ -359 +370 @@
 .legacy_mode:
 %endif ; VBOX_WITH_HYBRID_32BIT_KERNEL
-%endif
 
     ;
@@ -374 +384 @@
 
 .done:
+    popf
     ret