Changeset 1338 in vbox

Timestamp:

Mar 8, 2007 5:07:33 PM (18 years ago)

Author:

vboxsync

Message:

Moved the IF check.

File:

• trunk/src/VBox/VMM/PATM/PATMA.asm (modified) (3 diffs)

trunk/src/VBox/VMM/PATM/PATMA.asm

@@ -1128 +1128 @@
     jnz     iret_fault1
 
-    test    dword [esp+12], X86_EFL_IF
-    jz      iret_clearIF
-
     ; we can't do an iret to v86 code, as we run with CPL=1. The iret would attempt a protected mode iret and (most likely) fault.
     test    dword [esp+12], X86_EFL_VM
@@ -1141 +1138 @@
     test    dword [esp+8], 2
     jnz     iret_notring0
+
+    test    dword [esp+12], X86_EFL_IF
+    jz      iret_clearIF
 
     ; force ring 1 CS RPL
@@ -1219 +1219 @@
 
 iret_return_to_v86:   
+    test    dword [esp+12], X86_EFL_IF
+    jz      iret_fault
+
     ; Go to our hypervisor trap handler to perform the iret to v86 code
     mov     dword [ss:PATM_TEMP_EAX], eax