Changeset 39948 in vbox for trunk

Timestamp:

Feb 2, 2012 1:37:32 AM (13 years ago)

Author:

vboxsync

Message:

two int xxh bugfixes (32-bit prot mode).

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -1881 +1881 @@
         if (fFlags & IEM_XCPT_FLAGS_ERR)
             *uStackFrame.pu32++ = uErr;
-        uStackFrame.pu32[0] = pCtx->eip;
+        uStackFrame.pu32[0] = (fFlags & (IEM_XCPT_FLAGS_T_SOFT_INT | IEM_XCPT_FLAGS_BP_INSTR)) == IEM_XCPT_FLAGS_T_SOFT_INT
+                            ? pCtx->eip + cbInstr : pCtx->eip;
         uStackFrame.pu32[1] = (pCtx->cs & ~X86_SEL_RPL) | pIemCpu->uCpl;
         uStackFrame.pu32[2] = pCtx->eflags.u;
@@ -1935 +1936 @@
         if (fFlags & IEM_XCPT_FLAGS_ERR)
             *uStackFrame.pu32++ = uErr;
-        uStackFrame.pu32[0] = pCtx->eip;
+        uStackFrame.pu32[0] = (fFlags & (IEM_XCPT_FLAGS_T_SOFT_INT | IEM_XCPT_FLAGS_BP_INSTR)) == IEM_XCPT_FLAGS_T_SOFT_INT
+                            ? pCtx->eip + cbInstr : pCtx->eip;
         uStackFrame.pu32[1] = (pCtx->cs & ~X86_SEL_RPL) | pIemCpu->uCpl;
         uStackFrame.pu32[2] = pCtx->eflags.u;
@@ -4836 +4838 @@
     }
 
-    return iemMemCommitAndUnmap(pIemCpu, (void *)pu32, IEM_ACCESS_DATA_RW);
+    return iemMemCommitAndUnmap(pIemCpu, (void *)pu32, IEM_ACCESS_SYS_RW);
 }