diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | blastem.c | 8 | ||||
| -rw-r--r-- | debug.c | 4 | ||||
| -rw-r--r-- | gdb_remote.c | 2 |
4 files changed, 14 insertions, 8 deletions
@@ -33,6 +33,7 @@ else ifeq ($(CPU),i686) M68KOBJS+= runtime_32.o TRANSOBJS+= gen_x86.o +NOZ80:=1 endif endif @@ -44,13 +45,18 @@ MAINOBJS=blastem.o debug.o gdb_remote.o vdp.o render_sdl.o io.o $(CONFIGOBJS) gs ifeq ($(CPU),x86_64) CFLAGS+=-DX86_64 -MAINOBJS+= $(Z80OBJS) else ifeq ($(CPU),i686) CFLAGS+=-DX86_32 endif endif +ifdef NOZ80 +CFLAGS+=-DNO_Z80 +else +MAINOBJS+= $(Z80OBJS) +endif + all : dis zdis stateview vgmplay blastem @@ -182,7 +182,7 @@ uint8_t new_busack = 0; void sync_z80(z80_context * z_context, uint32_t mclks) { -#ifdef X86_64 +#ifndef NO_Z80 if (z80_enabled && !reset && !busreq) { genesis_context * gen = z_context->system; z_context->sync_cycle = mclks / MCLKS_PER_Z80; @@ -472,7 +472,7 @@ m68k_context * io_write(uint32_t location, m68k_context * context, uint8_t value location &= 0x7FFF; if (location < 0x4000) { z80_ram[location & 0x1FFF] = value; -#ifdef X86_64 +#ifndef NO_Z80 z80_handle_code_write(location & 0x1FFF, gen->z80); #endif } else if (location < 0x6000) { @@ -991,7 +991,7 @@ void init_run_cpu(genesis_context * gen, FILE * address_log, char * statefile, u insert_breakpoint(&context, pc, debugger); } adjust_int_cycle(gen->m68k, gen->vdp); -#ifdef X86_64 +#ifndef NO_Z80 gen->z80->native_pc = z80_get_native_address_trans(gen->z80, gen->z80->pc); #endif start_68k_context(&context, pc); @@ -1238,7 +1238,7 @@ int main(int argc, char ** argv) z80_context z_context; x86_z80_options z_opts; -#ifdef X86_64 +#ifndef NO_Z80 init_x86_z80_opts(&z_opts); init_z80_context(&z_context, &z_opts); #endif @@ -82,7 +82,7 @@ void strip_nl(char * buf) } } -#ifdef X86_64 +#ifndef NO_Z80 void zdebugger_print(z80_context * context, char format_char, char * param) { @@ -705,7 +705,7 @@ m68k_context * debugger(m68k_context * context, uint32_t address) } break; } -#ifdef X86_64 +#ifndef NO_Z80 case 'z': { genesis_context * gen = context->system; //Z80 debug commands diff --git a/gdb_remote.c b/gdb_remote.c index 11070f8..dd6a98a 100644 --- a/gdb_remote.c +++ b/gdb_remote.c @@ -145,7 +145,7 @@ void write_byte(m68k_context * context, uint32_t address, uint8_t value) } else if (address >= 0xA00000 && address < 0xA04000) { z80_ram[address & 0x1FFF] = value; genesis_context * gen = context->system; -#ifdef X86_64 +#ifndef NO_Z80 z80_handle_code_write(address & 0x1FFF, gen->z80); #endif return; |