    /* 5 */ { 0, &BX_CPU_C::BxError }, // JMP16_Ep
    /* 6 */ { 0, &BX_CPU_C::PUSH_EwR },
    /* 7 */ { 0, &BX_CPU_C::BxError }
-@@ -2939,10 +2939,10 @@
+@@ -2957,10 +2953,10 @@
  static const BxOpcodeInfo_t BxOpcodeInfo64G5dM[8] = {
    /* 0 */ { BxLockable, &BX_CPU_C::INC_EdM },
    /* 1 */ { BxLockable, &BX_CPU_C::DEC_EdM },

   // 18..18  mod==c0 (modrm)
   // 17..16  repUsed (0=none, 2=0xF2, 3=0xF3).
   Bit16u metaInfo3;
@@ -844,13 +845,22 @@
     metaInfo3 = (metaInfo3 & ~3) | (value);
   }
 

   /* C8 /dr */ { BxImmediate_IwIb, &BX_CPU_C::ENTER64_IwIb },
   /* C9 /dr */ { 0, &BX_CPU_C::LEAVE64 },
-  /* CA /dr */ { BxImmediate_Iw, &BX_CPU_C::RETfar32_Iw },
-  /* CB /dr */ { 0,              &BX_CPU_C::RETfar32 },
-  /* CC /dr */ { 0, &BX_CPU_C::INT3 },
-  /* CD /dr */ { BxImmediate_Ib, &BX_CPU_C::INT_Ib },
+  /* CA /dr */ { BxImmediate_Iw | BxTraceEnd, &BX_CPU_C::RETfar32_Iw },
+  /* CB /dr */ { BxTraceEnd,                  &BX_CPU_C::RETfar32 },
+  /* CC /dr */ { BxTraceEnd, &BX_CPU_C::INT3 },
+  /* CD /dr */ { BxImmediate_Ib | BxTraceEnd, &BX_CPU_C::INT_Ib },
   /* CE /dr */ { 0, &BX_CPU_C::BxError },
