Changeset 53188 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Nov 4, 2014 7:58:32 AM (10 years ago)

Author:

vboxsync

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

96734

Message:

IEM: into is invalid in 64-bit mode; added int1/icebp.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (2 diffs)
• IEMAllInstructions.cpp.h (modified) (3 diffs)

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

@@ -3200 +3200 @@
                             uint64_t    uCr2)
 {
-    NOREF(cbInstr);
-
     /*
      * Read the IDT entry.
@@ -3637 +3635 @@
                             uint64_t    uCr2)
 {
-    NOREF(cbInstr);
-
     /*
      * Read the IDT entry.

trunk/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h

@@ -12190 +12190 @@
 FNIEMOP_DEF(iemOp_into)
 {
+    IEMOP_MNEMONIC("into");
+    IEMOP_HLP_NO_64BIT();
+
     IEM_MC_BEGIN(2, 0);
     IEM_MC_ARG_CONST(uint8_t,   u8Int,      /*=*/ X86_XCPT_OF, 0);
@@ -16141 +16144 @@
     uint8_t b; IEM_OPCODE_GET_NEXT_U8(&b);
     return FNIEMOP_CALL(g_apfnOneByteMap[b]);
+}
+
+
+/** Opcode 0xf1. */
+FNIEMOP_DEF(iemOp_int_1)
+{
+    IEMOP_MNEMONIC("int1"); /* icebp */
+    /** @todo testcase! */
+    return IEM_MC_DEFER_TO_CIMPL_2(iemCImpl_int, X86_XCPT_DB, false /*fIsBpInstr*/);
 }
 
@@ -17305 +17317 @@
     /* 0xe8 */  iemOp_call_Jv,          iemOp_jmp_Jv,           iemOp_jmp_Ap,           iemOp_jmp_Jb,
     /* 0xec */  iemOp_in_AL_DX,         iemOp_eAX_DX,           iemOp_out_DX_AL,        iemOp_out_DX_eAX,
-    /* 0xf0 */  iemOp_lock,             iemOp_Invalid,          iemOp_repne,            iemOp_repe, /** @todo 0xf1 is INT1 / ICEBP. */
+    /* 0xf0 */  iemOp_lock,             iemOp_int_1,            iemOp_repne,            iemOp_repe,
     /* 0xf4 */  iemOp_hlt,              iemOp_cmc,              iemOp_Grp3_Eb,          iemOp_Grp3_Ev,
     /* 0xf8 */  iemOp_clc,              iemOp_stc,              iemOp_cli,              iemOp_sti,