 +  /* CC /dm */ { BxTraceEnd, &BX_CPU_C::INT3 },
 +  /* CD /dm */ { BxImmediate_Ib | BxTraceEnd, &BX_CPU_C::INT_Ib },
    /* CE /dm */ { 0, &BX_CPU_C::BxError },
--  /* CF /dm */ { 0, &BX_CPU_C::IRET32 },
-+  /* CF /dm */ { BxTraceEnd, &BX_CPU_C::IRET32 },
+-  /* CF /dm */ { 0, &BX_CPU_C::IRET64 },
++  /* CF /dm */ { BxTraceEnd, &BX_CPU_C::IRET64 },
    /* D0 /dm */ { BxGroup2, NULL, BxOpcodeInfoG2Eb },
    /* D1 /dm */ { BxGroup2, NULL, BxOpcodeInfoG2Ed },
    /* D2 /dm */ { BxGroup2, NULL, BxOpcodeInfoG2Eb },

   /* 80 /dr */ { BxGroup1 | BxImmediate_Ib, NULL, BxOpcodeInfoG1EbIbR },
   /* 81 /dr */ { BxGroup1 | BxImmediate_Iv,    NULL, BxOpcodeInfoG1EdR },
   /* 82 /dr */ { BxGroup1 | BxImmediate_Ib, NULL, BxOpcodeInfoG1EbIbR },
@@ -902,7 +902,7 @@
   /* 97 /dr */ { 0, &BX_CPU_C::XCHG_ERXEAX },
   /* 98 /dr */ { 0, &BX_CPU_C::CWDE },

+  /* CC /dr */ { BxTraceEnd, &BX_CPU_C::INT3 },
+  /* CD /dr */ { BxImmediate_Ib | BxTraceEnd, &BX_CPU_C::INT_Ib },
   /* CE /dr */ { 0, &BX_CPU_C::BxError },
-  /* CF /dr */ { 0, &BX_CPU_C::IRET64 },
+  /* CF /dr */ { BxTraceEnd, &BX_CPU_C::IRET64 },
   /* D0 /dr */ { BxGroup2, NULL, BxOpcodeInfoG2Eb },
   /* D1 /dr */ { BxGroup2, NULL, BxOpcodeInfoG2Ed },
   /* D2 /dr */ { BxGroup2, NULL, BxOpcodeInfoG2Eb },
