Changeset 13281 in vbox for trunk/src

Timestamp:

Oct 15, 2008 12:27:38 PM (16 years ago)

Author:

vboxsync

Message:

Fixed IP in the stack frame for #BP & #OF traps.

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (1 diff)

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

@@ -577 +577 @@
             return VINF_EM_RESET;
         }
-        if (VMX_EXIT_INTERRUPTION_INFO_TYPE(intInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW)
+        if (    VMX_EXIT_INTERRUPTION_INFO_TYPE(intInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW
+            ||  iGate == 3 /* Both #BP and #OF point to the instruction after. */
+            ||  iGate == 4)
+        {
             ip = pCtx->ip + cbInstr;
+        }
         else
             ip = pCtx->ip;