Changeset 15654 in vbox for trunk

Timestamp:

Dec 18, 2008 1:21:48 PM (16 years ago)

Author:

vboxsync

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

41188

Message:

Turn off interrupts in the 32/64 switcher.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HWVMXR0.cpp (modified) (3 diffs)
• VMMSwitcher/LegacyandAMD64.mac (modified) (4 diffs)

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

@@ -3602 +3602 @@
 {
     int             rc, rc2;
-    RTHCUINTREG     uFlags;
     PHWACCM_CPUINFO pCpu;
     RTHCPHYS        pPageCpuPhys;
@@ -3629 +3628 @@
     VMXDisable();
 
-    uFlags = ASMIntDisableFlags();
-
     CPUMSetHyperESP(pVM, VMMGetStackRC(pVM));
     CPUMSetHyperEIP(pVM, pfnHandler);
@@ -3642 +3639 @@
     RTHCUINTREG  uFlagsTest = ASMGetFlags();
 #endif
-
-    ASMSetFlags(uFlags);
 
     /* Make sure the VMX instructions don't cause #UD faults. */

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

@@ -72 +72 @@
  %endif
 
+    ; turn off interrupts
+    pushf
+    cli
+    
     ;
     ; Call worker.
@@ -80 +84 @@
     call    NAME(vmmR0HostToGuestAsm)
 
+    ; restore original flags
+    popf
+    
 %ifdef VBOX_WITH_STATISTICS
     ;
@@ -132 +139 @@
     sgdt    [edx + CPUMCPU.Host.gdtr]
     str     [edx + CPUMCPU.Host.tr]
-    ; flags
-    pushfd
-    pop     dword [edx + CPUMCPU.Host.eflags]
 
     ; control registers.
@@ -506 +510 @@
 
     ; store the return code in eax    
-    mov     eax, [edx + CPUMCPU.u32RetCode]
-    
-    push    dword [edx + CPUMCPU.Host.eflags]
-    popfd
-
+    mov     eax, [edx + CPUMCPU.u32RetCode]   
     retf
-        
 ENDPROC VMMGCGuestToHostAsm