From 5db5914748c1dba731c177e5914e1797148b5c17 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sat, 11 Apr 2020 13:36:38 -0700 Subject: Use proper memory map in Z80 debugger for memory printing --- debug.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'debug.c') diff --git a/debug.c b/debug.c index 92579f9..ad66adc 100644 --- a/debug.c +++ b/debug.c @@ -348,22 +348,7 @@ void zdebugger_print(z80_context * context, char format_char, char * param) case '0': if (param[1] == 'x') { uint16_t p_addr = strtol(param+2, NULL, 16); - if (p_addr < 0x4000) { - value = system->zram[p_addr & 0x1FFF]; - } else if(p_addr >= 0x8000) { - uint32_t v_addr = system->z80_bank_reg << 15; - v_addr += p_addr & 0x7FFF; - if (v_addr < 0x400000) { - value = system->cart[v_addr/2]; - } else if(v_addr > 0xE00000) { - value = system->work_ram[(v_addr & 0xFFFF)/2]; - } - if (v_addr & 1) { - value &= 0xFF; - } else { - value >>= 8; - } - } + value = read_byte(p_addr, (void **)context->mem_pointers, &context->options->gen, context); } break; } -- cgit v1.2.3