Changeset 1130 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 1, 2007 12:57:34 PM (18 years ago)

Author:

vboxsync

Message:

Enable WP later when returning to V86 code from our generic trap handler.

File:

• trunk/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm (modified) (2 diffs)

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm

@@ -430 +430 @@
 %endif
 
+    ; restore guest state and start executing again.
+    test    dword [esp + CPUMCTXCORE.eflags], X86_EFL_VM
+    jnz short gt_V86Return
+
     ; enable WP
     mov     eax, cr0
     or      eax, X86_CR0_WRITE_PROTECT
     mov     cr0, eax
-
-    ; restore guest state and start executing again.
-    test    dword [esp + CPUMCTXCORE.eflags], X86_EFL_VM
-    jnz short gt_V86Return
 
     mov     ecx, [esp + CPUMCTXCORE.ecx]
@@ -511 +511 @@
     mov     eax, [esp + CPUMCTXCORE.eflags]
     mov     [esp + 10h + ESPOFF], eax           ; eflags
+
+    ; enable WP
+    mov     eax, cr0
+    or      eax, X86_CR0_WRITE_PROTECT
+    mov     cr0, eax
 
     ; finally restore our scratch register eax