Changeset 159 in vbox for trunk/src/VBox

Timestamp:

Jan 18, 2007 6:09:17 PM (18 years ago)

Author:

vboxsync

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

17613

Message:

Moved iret log statement up

File:

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

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

@@ -1041 +1041 @@
     mov     dword [ss:PATM_INTERRUPTFLAG], 0
     pushfd
+
+%ifdef PATM_LOG_IF_CHANGES
+    push    eax
+    push    ecx
+    push    edx
+    lea     edx, dword [ss:esp+4]        ;+ pushed flags -> iret eip
+    mov     eax, PATM_ACTION_LOG_IRET
+    lock    or dword [ss:PATM_PENDINGACTION], eax
+    mov     ecx, PATM_ACTION_MAGIC
+    db      0fh, 0bh        ; illegal instr (hardcoded assumption in PATMHandleIllegalInstrTrap)
+    pop     edx
+    pop     ecx
+    pop     eax
+%endif
+
     test    dword [esp], X86_EFL_NT
     jnz near iret_fault1
@@ -1078 +1093 @@
     ; Set IF again; below we make sure this won't cause problems.
     or      dword [ss:PATM_VMFLAGS], X86_EFL_IF
-
-%ifdef PATM_LOG_IF_CHANGES
-    push    eax
-    push    ecx
-    push    edx
-    lea     edx, dword [ss:esp+12+4]        ;3 pushes + pushed flags -> iret eip
-    mov     eax, PATM_ACTION_LOG_IRET
-    lock    or dword [ss:PATM_PENDINGACTION], eax
-    mov     ecx, PATM_ACTION_MAGIC
-    db      0fh, 0bh        ; illegal instr (hardcoded assumption in PATMHandleIllegalInstrTrap)
-    pop     edx
-    pop     ecx
-    pop     eax
-%endif
-
     popfd
 
@@ -1128 +1128 @@
     DD      PATM_INTERRUPTFLAG
     DD      0
+%ifdef PATM_LOG_IF_CHANGES
+    DD      PATM_PENDINGACTION
+    DD      0
+%endif
     DD      PATM_VM_FORCEDACTIONS
     DD      0
@@ -1136 +1140 @@
     DD      PATM_VMFLAGS
     DD      0
-%ifdef PATM_LOG_IF_CHANGES
-    DD      PATM_PENDINGACTION
-    DD      0
-%endif
     DD      PATM_INHIBITIRQADDR
     DD      0