was playing with SMP and debugger

bochs/CHANGES

@@ -94,6 +94,7 @@ Bochs repository moved to the SVN version control !
   [3190995] add eth backend based on Slirp by Heikki Lindholm
 
 - these S.F. bugs were closed/fixed
+  [3324111] configure for VCPP.NET issues
   [3190970] Installing linux causes a crash in pci_ide
   [3077616] Fedora 13 installation fails on Bochs 2.4.5
   [3294671] ./configure --enable-pci --disable-cdrom

bochs/bochs.h

@@ -197,15 +197,10 @@ void print_tree(bx_param_c *node, int level = 0);
 #  define A20ADDR(x)                ((bx_phy_address)(x))
 #endif
 
-#if BX_SUPPORT_SMP
+#define BX_TICK1_IF_SINGLE_PROCESSOR() \
-#  define BX_TICK1_IF_SINGLE_PROCESSOR() \
+   if (BX_SMP_PROCESSORS == 1) BX_TICK1()
-              if (BX_SMP_PROCESSORS == 1) BX_TICK1()
+#define BX_TICKN_IF_SINGLE_PROCESSOR(n) \
-#  define BX_TICKN_IF_SINGLE_PROCESSOR(n) \
+   if (BX_SMP_PROCESSORS == 1) BX_TICKN(n)
-              if (BX_SMP_PROCESSORS == 1) BX_TICKN(n)
-#else
-#  define BX_TICK1_IF_SINGLE_PROCESSOR()  BX_TICK1()
-#  define BX_TICKN_IF_SINGLE_PROCESSOR(n) BX_TICKN(n)
-#endif
 
 // you can't use static member functions on the CPU, if there are going
 // to be 2 cpus.  Check this early on.

bochs/bx_debug/dbg_main.cc

@@ -1778,7 +1778,6 @@ one_more:
   for (cpu=0; cpu < BX_SMP_PROCESSORS; cpu++) {
     BX_CPU(cpu)->guard_found.guard_found = 0;
     BX_CPU(cpu)->guard_found.icount = 0;
-    BX_CPU(cpu)->guard_found.time_tick = bx_pc_system.time_ticks();
   }
 
   // update gui (disable continue command, enable stop command, etc.)
@@ -1869,7 +1868,6 @@ void bx_dbg_stepN_command(int cpu, Bit32u count)
   // reset guard counters for all CPUs
   for (unsigned n=0; n < BX_SMP_PROCESSORS; n++) {
     BX_CPU(n)->guard_found.icount = 0;
-    BX_CPU(n)->guard_found.time_tick = bx_pc_system.time_ticks();
   }
 
   if (cpu >= 0 || BX_SUPPORT_SMP==0) {

bochs/bx_debug/debug.h

@@ -380,8 +380,6 @@ void bx_dbg_exit(int code);
                                 BX_DBG_GUARD_IADDR_LIN | \
                                 BX_DBG_GUARD_IADDR_PHY)
 
-#define BX_DBG_GUARD_CTRL_C        0x0100
-
 typedef struct {
   unsigned guard_for;
 
@@ -462,8 +460,6 @@ typedef struct bx_guard_found_t {
   bx_address laddr;
   // 00 - 16 bit, 01 - 32 bit, 10 - 64-bit, 11 - illegal
   unsigned code_32_64; // CS seg size at guard point
-  bx_bool ctrl_c; // simulator stopped due to Ctrl-C request
-  Bit64u  time_tick; // time tick when guard reached
 } bx_guard_found_t;
 
 struct bx_watchpoint {

bochs/cpu/cpu.cc

@@ -862,7 +862,6 @@ bx_bool BX_CPU_C::dbg_instruction_epilog(void)
         {
           BX_CPU_THIS_PTR guard_found.guard_found = BX_DBG_GUARD_IADDR_VIR;
           BX_CPU_THIS_PTR guard_found.iaddr_index = n;
-          BX_CPU_THIS_PTR guard_found.time_tick = tt;
           return(1); // on a breakpoint
         }
       }
@@ -876,7 +875,6 @@ bx_bool BX_CPU_C::dbg_instruction_epilog(void)
         {
           BX_CPU_THIS_PTR guard_found.guard_found = BX_DBG_GUARD_IADDR_LIN;
           BX_CPU_THIS_PTR guard_found.iaddr_index = n;
-          BX_CPU_THIS_PTR guard_found.time_tick = tt;
           return(1); // on a breakpoint
         }
       }
@@ -892,7 +890,6 @@ bx_bool BX_CPU_C::dbg_instruction_epilog(void)
           {
             BX_CPU_THIS_PTR guard_found.guard_found = BX_DBG_GUARD_IADDR_PHY;
             BX_CPU_THIS_PTR guard_found.iaddr_index = n;
-            BX_CPU_THIS_PTR guard_found.time_tick = tt;
             return(1); // on a breakpoint
           }
         }

bochs/main.cc

@@ -935,6 +935,7 @@ int bx_begin_simulation (int argc, char *argv[])
       // for one processor, the only reason for cpu_loop to return is
       // that kill_bochs_request was set by the GUI interface.
     }
+#if BX_SUPPORT_SMP
     else {
       // SMP simulation: do a few instructions on each processor, then switch
       // to another.  Increasing quantum speeds up overall performance, but
@@ -951,6 +952,7 @@ int bx_begin_simulation (int argc, char *argv[])
           BX_TICKN(quantum);
       }
     }
+#endif /* BX_SUPPORT_SMP */
   }
 #endif /* BX_DEBUGGER == 0 */
   BX_INFO(("cpu loop quit, shutting down simulator"));