Mercurial > repos > blastem
diff blastcpm.c @ 1773:0a26f3657295 mame_interp
Remove MAME Z80 core in favor of my new Z80 core
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Tue, 12 Mar 2019 21:59:52 -0700 |
| parents | 8fe162bdb038 |
| children | 374a5ae694e8 |
line wrap: on
line diff
--- a/blastcpm.c Tue Mar 12 21:58:53 2019 -0700 +++ b/blastcpm.c Tue Mar 12 21:59:52 2019 -0700 @@ -5,14 +5,10 @@ #include <time.h> #include <sys/select.h> -#ifdef NEW_CORE -#include "z80.h" -#else #ifdef USE_NATIVE #include "z80_to_x86.h" #else -#include "mame_z80/z80.h" -#endif +#include "z80.h" #endif #include "util.h" @@ -23,7 +19,7 @@ #define OS_RESET 0xE403 int headless = 1; -#ifndef NEW_CORE +#ifdef USE_NATIVE void z80_next_int_pulse(z80_context * context) { context->int_pulse_start = context->int_pulse_end = CYCLE_NEVER; @@ -72,10 +68,10 @@ { time_t duration = time(NULL) - start; z80_context *z80 = context; -#ifdef NEW_CORE +#ifdef USE_NATIVE + total_cycles += context->current_cycle; +#else total_cycles += z80->cycles; -#else - total_cycles += context->current_cycle; #endif printf("Effective clock speed: %f MHz\n", ((double)total_cycles) / (1000000.0 * duration)); exit(0); @@ -127,14 +123,13 @@ start = time(NULL); for(;;) { -#ifdef NEW_CORE - z80_execute(context, 1000000); + z80_run(context, 1000000); +#ifdef USE_NATIVE + total_cycles += context->current_cycle; + context->current_cycle = 0; +#else total_cycles += context->cycles; context->cycles = 0; -#else - z80_run(context, 1000000); - total_cycles += context->current_cycle; - context->current_cycle = 0; #endif }