Changeset 66887 in vbox

Timestamp:

May 15, 2017 9:55:25 AM (8 years ago)

Author:

vboxsync

Message:

VMM/IEM: int1/icebp also sets EXT error bit on nested exceptions.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (1 diff)

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

@@ -5534 +5534 @@
         /*
          * The 'EXT' bit is set when an exception occurs during deliver of an external
-         * event (such as an interrupt or earlier exception), see Intel spec. 6.13
-         * "Error Code".
+         * event (such as an interrupt or earlier exception)[1]. Privileged software
+         * exception (INT1) also sets the EXT bit[2]. Exceptions generated by software
+         * interrupts and INTO, INT3 instructions, the 'EXT' bit will not be set.
          *
-         * For exceptions generated by software interrupts and INTO, INT3 instructions,
-         * the 'EXT' bit will not be set, see Intel Instruction reference for INT n.
+         * [1] - Intel spec. 6.13 "Error Code"
+         * [2] - Intel spec. 26.5.1.1 "Details of Vectored-Event Injection".
+         * [3] - Intel Instruction reference for INT n.
          */
-        /** @todo Would INT1/ICEBP raised \#DB set the 'EXT' bit or not? Testcase... */
-        if (   (fPrevXcpt & (IEM_XCPT_FLAGS_T_CPU_XCPT | IEM_XCPT_FLAGS_T_EXT_INT))
+        if (   (fPrevXcpt & (IEM_XCPT_FLAGS_T_CPU_XCPT | IEM_XCPT_FLAGS_T_EXT_INT | IEM_XCPT_FLAGS_ICEBP_INSTR))
             && (fFlags & IEM_XCPT_FLAGS_ERR)
             && u8Vector != X86_XCPT_PF