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

 #define BxGroup3          BxGroupN
diff -ur bochs/cpu/fetchdecode.cc bochs-trace-cache/cpu/fetchdecode.cc
--- bochs/cpu/fetchdecode.cc	2007-11-23 18:37:05.000000000 +0200
+++ bochs-trace-cache/cpu/fetchdecode.cc	2007-11-23 17:51:47.968750000 +0200
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id$
+// $Id$
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -296,22 +296,22 @@
   /* 6D /wr */ { 0, &BX_CPU_C::REP_INSW_YwDX },
   /* 6E /wr */ { 0, &BX_CPU_C::REP_OUTSB_DXXb },

-      bx_dbg_disassemble_current(BX_CPU_ID, 1); // only one cpu, print time stamp
+        bx_dbg_disassemble_current(BX_CPU_ID, 1); // only one cpu, print time stamp
 #else
-      debug_disasm_instruction(BX_CPU_THIS_PTR prev_rip);
+        debug_disasm_instruction(BX_CPU_THIS_PTR prev_rip);
 #endif
-    }
+      }
