--- trunk/src/emul.c 2007/10/08 16:20:18 27 +++ trunk/src/emul.c 2007/10/08 16:20:26 28 @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * - * $Id: emul.c,v 1.255 2006/06/24 19:52:27 debug Exp $ + * $Id: emul.c,v 1.258 2006/07/20 21:52:59 debug Exp $ * * Emulation startup and misc. routines. */ @@ -1279,6 +1279,10 @@ case ARCH_SPARC: break; + case ARCH_TRANSPUTER: + cpu->pc &= 0xffffffffULL; + break; + case ARCH_X86: /* * NOTE: The toc field is used to indicate an ELF32 @@ -1582,22 +1586,22 @@ go = 0; /* Flush X11 and serial console output every now and then: */ - if (emuls[0]->machines[0]->ncycles > - emuls[0]->machines[0]->ncycles_flush + (1<<18)) { + if (emuls[0]->machines[0]->ninstrs > + emuls[0]->machines[0]->ninstrs_flush + (1<<19)) { x11_check_event(emuls, n_emuls); console_flush(); - emuls[0]->machines[0]->ncycles_flush = - emuls[0]->machines[0]->ncycles; + emuls[0]->machines[0]->ninstrs_flush = + emuls[0]->machines[0]->ninstrs; } - if (emuls[0]->machines[0]->ncycles > - emuls[0]->machines[0]->ncycles_show + (1<<25)) { - emuls[0]->machines[0]->ncycles_since_gettimeofday += - (emuls[0]->machines[0]->ncycles - - emuls[0]->machines[0]->ncycles_show); + if (emuls[0]->machines[0]->ninstrs > + emuls[0]->machines[0]->ninstrs_show + (1<<25)) { + emuls[0]->machines[0]->ninstrs_since_gettimeofday += + (emuls[0]->machines[0]->ninstrs - + emuls[0]->machines[0]->ninstrs_show); cpu_show_cycles(emuls[0]->machines[0], 0); - emuls[0]->machines[0]->ncycles_show = - emuls[0]->machines[0]->ncycles; + emuls[0]->machines[0]->ninstrs_show = + emuls[0]->machines[0]->ninstrs; } if (single_step == ENTER_SINGLE_STEPPING) {