Remove the 'trace' debug feature fro the main stream (which now runs with handlers chaining) and this way reduce each handler size.

Another 3% speedup on WinXP boot on top of handlers chaining + reduction of Bochs binary size by 45K.

bochs/cpu/cpu.h

@@ -1022,6 +1022,7 @@ public: // for now...
   Bit8u break_point;
   Bit8u magic_break;
   Bit8u stop_reason;
+  bx_bool trace;
   bx_bool trace_reg;
   bx_bool trace_mem;
   bx_bool mode_break;
@@ -1031,7 +1032,6 @@ public: // for now...
   unsigned show_flag;
   bx_guard_found_t guard_found;
 #endif
-  Bit8u trace;
 
   // for paging
   struct {

bochs/cpu/init.cc

@@ -614,7 +614,6 @@ void BX_CPU_C::register_state(void)
   BXRS_PARAM_BOOL(cpu, pending_NMI, pending_NMI);
   BXRS_PARAM_BOOL(cpu, disable_INIT, disable_INIT);
   BXRS_PARAM_BOOL(cpu, pending_INIT, pending_INIT);
-  BXRS_PARAM_BOOL(cpu, trace, trace);
 }
 
 Bit64s BX_CPU_C::param_save_handler(void *devptr, bx_param_c *param)
@@ -1037,12 +1036,11 @@ void BX_CPU_C::reset(unsigned source)
 #if BX_DEBUGGER
   BX_CPU_THIS_PTR stop_reason = STOP_NO_REASON;
   BX_CPU_THIS_PTR magic_break = 0;
+  BX_CPU_THIS_PTR trace = 0;
   BX_CPU_THIS_PTR trace_reg = 0;
   BX_CPU_THIS_PTR trace_mem = 0;
 #endif
 
-  BX_CPU_THIS_PTR trace = 0;
-
   // Reset the Floating Point Unit
 #if BX_SUPPORT_FPU
   if (source == BX_RESET_HARDWARE) {

bochs/cpu/instr.h

@@ -28,7 +28,7 @@ class bxInstruction_c;
 
 typedef void BX_INSF_TYPE;
 
-#if BX_DISASM
+#if BX_DEBUGGER && BX_DISASM
   // print the instruction that is about to be executed
   #define BX_DEBUG_DISASM_INSTRUCTION() \
       if (BX_CPU_THIS_PTR trace) { debug_disasm_instruction(BX_CPU_THIS_PTR prev_rip); }
@@ -46,7 +46,6 @@ typedef void BX_INSF_TYPE;
   BX_TICK1_IF_SINGLE_PROCESSOR();                      \
   if (BX_CPU_THIS_PTR async_event) return;             \
   ++i;                                                 \
-  BX_DEBUG_DISASM_INSTRUCTION();                       \
   BX_INSTR_BEFORE_EXECUTION(BX_CPU_ID, i);             \
   RIP += i->ilen();                                    \
   return BX_CPU_CALL_METHOD(i->execute, (i));          \