Mercurial > repos > blastem
changeset 524:fb39534b6604
Move debugging code outside of main source file
| author | Mike Pavone <pavone@retrodev.com> |
|---|---|
| date | Tue, 11 Feb 2014 21:53:31 -0800 |
| parents | 450c7745379a |
| children | 62860044337d |
| files | Makefile blastem.c blastem.h debug.c debug.h |
| diffstat | 5 files changed, 780 insertions(+), 754 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue Feb 11 21:52:15 2014 -0800 +++ b/Makefile Tue Feb 11 21:53:31 2014 -0800 @@ -26,8 +26,8 @@ all : dis zdis stateview vgmplay blastem -blastem : blastem.o gdb_remote.o vdp.o render_sdl.o io.o $(CONFIGOBJS) gst.o $(M68KOBJS) $(Z80OBJS) $(TRANSOBJS) $(AUDIOOBJS) - $(CC) -ggdb -o blastem blastem.o gdb_remote.o vdp.o render_sdl.o io.o $(CONFIGOBJS) gst.o $(M68KOBJS) $(Z80OBJS) $(TRANSOBJS) $(AUDIOOBJS) $(LDFLAGS) +blastem : blastem.o debug.o gdb_remote.o vdp.o render_sdl.o io.o $(CONFIGOBJS) gst.o $(M68KOBJS) $(Z80OBJS) $(TRANSOBJS) $(AUDIOOBJS) + $(CC) -ggdb -o blastem blastem.o debug.o gdb_remote.o vdp.o render_sdl.o io.o $(CONFIGOBJS) gst.o $(M68KOBJS) $(Z80OBJS) $(TRANSOBJS) $(AUDIOOBJS) $(LDFLAGS) dis : dis.o 68kinst.o $(CC) -o dis dis.o 68kinst.o
--- a/blastem.c Tue Feb 11 21:52:15 2014 -0800 +++ b/blastem.c Tue Feb 11 21:53:31 2014 -0800 @@ -848,758 +848,6 @@ return context; } -typedef struct bp_def { - struct bp_def * next; - uint32_t address; - uint32_t index; -} bp_def; - -bp_def * breakpoints = NULL; -bp_def * zbreakpoints = NULL; -uint32_t bp_index = 0; -uint32_t zbp_index = 0; - -bp_def ** find_breakpoint(bp_def ** cur, uint32_t address) -{ - while (*cur) { - if ((*cur)->address == address) { - break; - } - cur = &((*cur)->next); - } - return cur; -} - -bp_def ** find_breakpoint_idx(bp_def ** cur, uint32_t index) -{ - while (*cur) { - if ((*cur)->index == index) { - break; - } - cur = &((*cur)->next); - } - return cur; -} - -typedef struct disp_def { - struct disp_def * next; - char * param; - uint32_t index; - char format_char; -} disp_def; - -disp_def * displays = NULL; -disp_def * zdisplays = NULL; -uint32_t disp_index = 0; -uint32_t zdisp_index = 0; - -void add_display(disp_def ** head, uint32_t *index, char format_char, char * param) -{ - disp_def * ndisp = malloc(sizeof(*ndisp)); - ndisp->format_char = format_char; - ndisp->param = strdup(param); - ndisp->next = *head; - ndisp->index = *index++; - *head = ndisp; -} - -void remove_display(disp_def ** head, uint32_t index) -{ - while (*head) { - if ((*head)->index == index) { - disp_def * del_disp = *head; - *head = del_disp->next; - free(del_disp->param); - free(del_disp); - } else { - head = &(*head)->next; - } - } -} - -char * find_param(char * buf) -{ - for (; *buf; buf++) { - if (*buf == ' ') { - if (*(buf+1)) { - return buf+1; - } - } - } - return NULL; -} - -void strip_nl(char * buf) -{ - for(; *buf; buf++) { - if (*buf == '\n') { - *buf = 0; - return; - } - } -} - -void zdebugger_print(z80_context * context, char format_char, char * param) -{ - uint32_t value; - char format[8]; - strcpy(format, "%s: %d\n"); - switch (format_char) - { - case 'x': - case 'X': - case 'd': - case 'c': - format[5] = format_char; - break; - case '\0': - break; - default: - fprintf(stderr, "Unrecognized format character: %c\n", format_char); - } - switch (param[0]) - { - case 'a': - if (param[1] == 'f') { - if(param[2] == '\'') { - value = context->alt_regs[Z80_A] << 8; - value |= context->alt_flags[ZF_S] << 7; - value |= context->alt_flags[ZF_Z] << 6; - value |= context->alt_flags[ZF_H] << 4; - value |= context->alt_flags[ZF_PV] << 2; - value |= context->alt_flags[ZF_N] << 1; - value |= context->alt_flags[ZF_C]; - } else { - value = context->regs[Z80_A] << 8; - value |= context->flags[ZF_S] << 7; - value |= context->flags[ZF_Z] << 6; - value |= context->flags[ZF_H] << 4; - value |= context->flags[ZF_PV] << 2; - value |= context->flags[ZF_N] << 1; - value |= context->flags[ZF_C]; - } - } else if(param[1] == '\'') { - value = context->alt_regs[Z80_A]; - } else { - value = context->regs[Z80_A]; - } - break; - case 'b': - if (param[1] == 'c') { - if(param[2] == '\'') { - value = context->alt_regs[Z80_B] << 8; - value |= context->alt_regs[Z80_C]; - } else { - value = context->regs[Z80_B] << 8; - value |= context->regs[Z80_C]; - } - } else if(param[1] == '\'') { - value = context->alt_regs[Z80_B]; - } else if(param[1] == 'a') { - value = context->bank_reg << 15; - } else { - value = context->regs[Z80_B]; - } - break; - case 'c': - if(param[1] == '\'') { - value = context->alt_regs[Z80_C]; - } else if(param[1] == 'y') { - value = context->current_cycle; - } else { - value = context->regs[Z80_C]; - } - break; - case 'd': - if (param[1] == 'e') { - if(param[2] == '\'') { - value = context->alt_regs[Z80_D] << 8; - value |= context->alt_regs[Z80_E]; - } else { - value = context->regs[Z80_D] << 8; - value |= context->regs[Z80_E]; - } - } else if(param[1] == '\'') { - value = context->alt_regs[Z80_D]; - } else { - value = context->regs[Z80_D]; - } - break; - case 'e': - if(param[1] == '\'') { - value = context->alt_regs[Z80_E]; - } else { - value = context->regs[Z80_E]; - } - break; - case 'f': - if(param[2] == '\'') { - value = context->alt_flags[ZF_S] << 7; - value |= context->alt_flags[ZF_Z] << 6; - value |= context->alt_flags[ZF_H] << 4; - value |= context->alt_flags[ZF_PV] << 2; - value |= context->alt_flags[ZF_N] << 1; - value |= context->alt_flags[ZF_C]; - } else { - value = context->flags[ZF_S] << 7; - value |= context->flags[ZF_Z] << 6; - value |= context->flags[ZF_H] << 4; - value |= context->flags[ZF_PV] << 2; - value |= context->flags[ZF_N] << 1; - value |= context->flags[ZF_C]; - } - break; - case 'h': - if (param[1] == 'l') { - if(param[2] == '\'') { - value = context->alt_regs[Z80_H] << 8; - value |= context->alt_regs[Z80_L]; - } else { - value = context->regs[Z80_H] << 8; - value |= context->regs[Z80_L]; - } - } else if(param[1] == '\'') { - value = context->alt_regs[Z80_H]; - } else { - value = context->regs[Z80_H]; - } - break; - case 'l': - if(param[1] == '\'') { - value = context->alt_regs[Z80_L]; - } else { - value = context->regs[Z80_L]; - } - break; - case 'i': - if(param[1] == 'x') { - if (param[2] == 'h') { - value = context->regs[Z80_IXH]; - } else if(param[2] == 'l') { - value = context->regs[Z80_IXL]; - } else { - value = context->regs[Z80_IXH] << 8; - value |= context->regs[Z80_IXL]; - } - } else if(param[1] == 'y') { - if (param[2] == 'h') { - value = context->regs[Z80_IYH]; - } else if(param[2] == 'l') { - value = context->regs[Z80_IYL]; - } else { - value = context->regs[Z80_IYH] << 8; - value |= context->regs[Z80_IYL]; - } - } else if(param[1] == 'n') { - value = context->int_cycle; - } else if(param[1] == 'f' && param[2] == 'f' && param[3] == '1') { - value = context->iff1; - } else if(param[1] == 'f' && param[2] == 'f' && param[3] == '2') { - value = context->iff2; - } else { - value = context->im; - } - break; - case 's': - if (param[1] == 'p') { - value = context->sp; - } - break; - case '0': - if (param[1] == 'x') { - uint16_t p_addr = strtol(param+2, NULL, 16); - if (p_addr < 0x4000) { - value = z80_ram[p_addr & 0x1FFF]; - } else if(p_addr >= 0x8000) { - uint32_t v_addr = context->bank_reg << 15; - v_addr += p_addr & 0x7FFF; - if (v_addr < 0x400000) { - value = cart[v_addr/2]; - } else if(v_addr > 0xE00000) { - value = ram[(v_addr & 0xFFFF)/2]; - } - if (v_addr & 1) { - value &= 0xFF; - } else { - value >>= 8; - } - } - } - break; - } - printf(format, param, value); -} - -z80_context * zdebugger(z80_context * context, uint16_t address) -{ - static char last_cmd[1024]; - char input_buf[1024]; - static uint16_t branch_t; - static uint16_t branch_f; - z80inst inst; - //Check if this is a user set breakpoint, or just a temporary one - bp_def ** this_bp = find_breakpoint(&zbreakpoints, address); - if (*this_bp) { - printf("Z80 Breakpoint %d hit\n", (*this_bp)->index); - } else { - zremove_breakpoint(context, address); - } - uint8_t * pc; - if (address < 0x4000) { - pc = z80_ram + (address & 0x1FFF); - } else if (address >= 0x8000) { - if (context->bank_reg < (0x400000 >> 15)) { - fprintf(stderr, "Entered Z80 debugger in banked memory address %X, which is not yet supported\n", address); - exit(1); - } else { - fprintf(stderr, "Entered Z80 debugger in banked memory address %X, but the bank is not pointed to a cartridge address\n", address); - exit(1); - } - } else { - fprintf(stderr, "Entered Z80 debugger at address %X\n", address); - exit(1); - } - for (disp_def * cur = zdisplays; cur; cur = cur->next) { - zdebugger_print(context, cur->format_char, cur->param); - } - uint8_t * after_pc = z80_decode(pc, &inst); - z80_disasm(&inst, input_buf, address); - printf("%X:\t%s\n", address, input_buf); - uint16_t after = address + (after_pc-pc); - int debugging = 1; - while(debugging) { - fputs(">", stdout); - if (!fgets(input_buf, sizeof(input_buf), stdin)) { - fputs("fgets failed", stderr); - break; - } - strip_nl(input_buf); - //hitting enter repeats last command - if (input_buf[0]) { - strcpy(last_cmd, input_buf); - } else { - strcpy(input_buf, last_cmd); - } - char * param; - char format[8]; - uint32_t value; - bp_def * new_bp; - switch(input_buf[0]) - { - case 'a': - param = find_param(input_buf); - if (!param) { - fputs("a command requires a parameter\n", stderr); - break; - } - value = strtol(param, NULL, 16); - zinsert_breakpoint(context, value, (uint8_t *)zdebugger); - debugging = 0; - break; - case 'b': - param = find_param(input_buf); - if (!param) { - fputs("b command requires a parameter\n", stderr); - break; - } - value = strtol(param, NULL, 16); - zinsert_breakpoint(context, value, (uint8_t *)zdebugger); - new_bp = malloc(sizeof(bp_def)); - new_bp->next = zbreakpoints; - new_bp->address = value; - new_bp->index = zbp_index++; - zbreakpoints = new_bp; - printf("Z80 Breakpoint %d set at %X\n", new_bp->index, value); - break; - case 'c': - puts("Continuing"); - debugging = 0; - break; - case 'd': - if (input_buf[1] == 'i') { - char format_char = 0; - for(int i = 2; input_buf[i] != 0 && input_buf[i] != ' '; i++) { - if (input_buf[i] == '/') { - format_char = input_buf[i+1]; - break; - } - } - param = find_param(input_buf); - if (!param) { - fputs("display command requires a parameter\n", stderr); - break; - } - zdebugger_print(context, format_char, param); - add_display(&zdisplays, &zdisp_index, format_char, param); - } else if (input_buf[1] == 'e' || input_buf[1] == ' ') { - param = find_param(input_buf); - if (!param) { - fputs("delete command requires a parameter\n", stderr); - break; - } - if (param[0] >= '0' && param[0] <= '9') { - value = atoi(param); - this_bp = find_breakpoint_idx(&zbreakpoints, value); - if (!*this_bp) { - fprintf(stderr, "Breakpoint %d does not exist\n", value); - break; - } - new_bp = *this_bp; - zremove_breakpoint(context, new_bp->address); - *this_bp = new_bp->next; - free(new_bp); - } else if (param[0] == 'd') { - param = find_param(param); - if (!param) { - fputs("delete display command requires a parameter\n", stderr); - break; - } - remove_display(&zdisplays, atoi(param)); - } - } - break; - case 'n': - //TODO: Handle conditional branch instructions - if (inst.op == Z80_JP) { - if (inst.addr_mode == Z80_IMMED) { - after = inst.immed; - } else if (inst.ea_reg == Z80_HL) { - after = context->regs[Z80_H] << 8 | context->regs[Z80_L]; - } else if (inst.ea_reg == Z80_IX) { - after = context->regs[Z80_IXH] << 8 | context->regs[Z80_IXL]; - } else if (inst.ea_reg == Z80_IY) { - after = context->regs[Z80_IYH] << 8 | context->regs[Z80_IYL]; - } - } else if(inst.op == Z80_JR) { - after += inst.immed; - } else if(inst.op == Z80_RET) { - if (context->sp < 0x4000) { - after = z80_ram[context->sp & 0x1FFF] | z80_ram[(context->sp+1) & 0x1FFF] << 8; - } - } - zinsert_breakpoint(context, after, (uint8_t *)zdebugger); - debugging = 0; - break; - case 'p': - param = find_param(input_buf); - if (!param) { - fputs("p command requires a parameter\n", stderr); - break; - } - zdebugger_print(context, input_buf[1] == '/' ? input_buf[2] : 0, param); - break; - case 'q': - puts("Quitting"); - exit(0); - break; - case 's': { - param = find_param(input_buf); - if (!param) { - fputs("s command requires a file name\n", stderr); - break; - } - FILE * f = fopen(param, "wb"); - if (f) { - if(fwrite(z80_ram, 1, sizeof(z80_ram), f) != sizeof(z80_ram)) { - fputs("Error writing file\n", stderr); - } - fclose(f); - } else { - fprintf(stderr, "Could not open %s for writing\n", param); - } - break; - } - default: - fprintf(stderr, "Unrecognized debugger command %s\n", input_buf); - break; - } - } - return context; -} - -m68k_context * debugger(m68k_context * context, uint32_t address) -{ - static char last_cmd[1024]; - char input_buf[1024]; - static uint32_t branch_t; - static uint32_t branch_f; - m68kinst inst; - //probably not necessary, but let's play it safe - address &= 0xFFFFFF; - if (address == branch_t) { - bp_def ** f_bp = find_breakpoint(&breakpoints, branch_f); - if (!*f_bp) { - remove_breakpoint(context, branch_f); - } - branch_t = branch_f = 0; - } else if(address == branch_f) { - bp_def ** t_bp = find_breakpoint(&breakpoints, branch_t); - if (!*t_bp) { - remove_breakpoint(context, branch_t); - } - branch_t = branch_f = 0; - } - //Check if this is a user set breakpoint, or just a temporary one - bp_def ** this_bp = find_breakpoint(&breakpoints, address); - if (*this_bp) { - printf("68K Breakpoint %d hit\n", (*this_bp)->index); - } else { - remove_breakpoint(context, address); - } - uint16_t * pc; - if (address < 0x400000) { - pc = cart + address/2; - } else if(address > 0xE00000) { - pc = ram + (address & 0xFFFF)/2; - } else { - fprintf(stderr, "Entered 68K debugger at address %X\n", address); - exit(1); - } - uint16_t * after_pc = m68k_decode(pc, &inst, address); - m68k_disasm(&inst, input_buf); - printf("%X: %s\n", address, input_buf); - uint32_t after = address + (after_pc-pc)*2; - int debugging = 1; - while (debugging) { - fputs(">", stdout); - if (!fgets(input_buf, sizeof(input_buf), stdin)) { - fputs("fgets failed", stderr); - break; - } - strip_nl(input_buf); - //hitting enter repeats last command - if (input_buf[0]) { - strcpy(last_cmd, input_buf); - } else { - strcpy(input_buf, last_cmd); - } - char * param; - char format[8]; - uint32_t value; - bp_def * new_bp; - switch(input_buf[0]) - { - case 'c': - puts("Continuing"); - debugging = 0; - break; - case 'b': - param = find_param(input_buf); - if (!param) { - fputs("b command requires a parameter\n", stderr); - break; - } - value = strtol(param, NULL, 16); - insert_breakpoint(context, value, (uint8_t *)debugger); - new_bp = malloc(sizeof(bp_def)); - new_bp->next = breakpoints; - new_bp->address = value; - new_bp->index = bp_index++; - breakpoints = new_bp; - printf("68K Breakpoint %d set at %X\n", new_bp->index, value); - break; - case 'a': - param = find_param(input_buf); - if (!param) { - fputs("a command requires a parameter\n", stderr); - break; - } - value = strtol(param, NULL, 16); - insert_breakpoint(context, value, (uint8_t *)debugger); - debugging = 0; - break; - case 'd': - param = find_param(input_buf); - if (!param) { - fputs("d command requires a parameter\n", stderr); - break; - } - value = atoi(param); - this_bp = find_breakpoint_idx(&breakpoints, value); - if (!*this_bp) { - fprintf(stderr, "Breakpoint %d does not exist\n", value); - break; - } - new_bp = *this_bp; - *this_bp = (*this_bp)->next; - free(new_bp); - break; - case 'p': - strcpy(format, "%s: %d\n"); - if (input_buf[1] == '/') { - switch (input_buf[2]) - { - case 'x': - case 'X': - case 'd': - case 'c': - format[5] = input_buf[2]; - break; - default: - fprintf(stderr, "Unrecognized format character: %c\n", input_buf[2]); - } - } - param = find_param(input_buf); - if (!param) { - fputs("p command requires a parameter\n", stderr); - break; - } - if (param[0] == 'd' && param[1] >= '0' && param[1] <= '7') { - value = context->dregs[param[1]-'0']; - } else if (param[0] == 'a' && param[1] >= '0' && param[1] <= '7') { - value = context->aregs[param[1]-'0']; - } else if (param[0] == 'S' && param[1] == 'R') { - value = (context->status << 8); - for (int flag = 0; flag < 5; flag++) { - value |= context->flags[flag] << (4-flag); - } - } else if(param[0] == 'c') { - value = context->current_cycle; - } else if (param[0] == '0' && param[1] == 'x') { - uint32_t p_addr = strtol(param+2, NULL, 16); - value = read_dma_value(p_addr/2); - } else { - fprintf(stderr, "Unrecognized parameter to p: %s\n", param); - break; - } - printf(format, param, value); - break; - case 'n': - if (inst.op == M68K_RTS) { - after = (read_dma_value(context->aregs[7]/2) << 16) | read_dma_value(context->aregs[7]/2 + 1); - } else if (inst.op == M68K_RTE || inst.op == M68K_RTR) { - after = (read_dma_value((context->aregs[7]+2)/2) << 16) | read_dma_value((context->aregs[7]+2)/2 + 1); - } else if(m68k_is_noncall_branch(&inst)) { - if (inst.op == M68K_BCC && inst.extra.cond != COND_TRUE) { - branch_f = after; - branch_t = m68k_branch_target(&inst, context->dregs, context->aregs); - insert_breakpoint(context, branch_t, (uint8_t *)debugger); - } else if(inst.op == M68K_DBCC) { - if ( inst.extra.cond == COND_FALSE) { - if (context->dregs[inst.dst.params.regs.pri] & 0xFFFF) { - after = m68k_branch_target(&inst, context->dregs, context->aregs); - } - } else { - branch_t = after; - branch_f = m68k_branch_target(&inst, context->dregs, context->aregs); - insert_breakpoint(context, branch_f, (uint8_t *)debugger); - } - } else { - after = m68k_branch_target(&inst, context->dregs, context->aregs); - } - } - insert_breakpoint(context, after, (uint8_t *)debugger); - debugging = 0; - break; - case 'o': - if (inst.op == M68K_RTS) { - after = (read_dma_value(context->aregs[7]/2) << 16) | read_dma_value(context->aregs[7]/2 + 1); - } else if (inst.op == M68K_RTE || inst.op == M68K_RTR) { - after = (read_dma_value((context->aregs[7]+2)/2) << 16) | read_dma_value((context->aregs[7]+2)/2 + 1); - } else if(m68k_is_noncall_branch(&inst)) { - if (inst.op == M68K_BCC && inst.extra.cond != COND_TRUE) { - branch_t = m68k_branch_target(&inst, context->dregs, context->aregs); - if (branch_t < after) { - branch_t = 0; - } else { - branch_f = after; - insert_breakpoint(context, branch_t, (uint8_t *)debugger); - } - } else if(inst.op == M68K_DBCC) { - uint32_t target = m68k_branch_target(&inst, context->dregs, context->aregs); - if (target > after) { - if (inst.extra.cond == COND_FALSE) { - after = target; - } else { - branch_f = target; - branch_t = after; - insert_breakpoint(context, branch_f, (uint8_t *)debugger); - } - } - } else { - after = m68k_branch_target(&inst, context->dregs, context->aregs); - } - } - insert_breakpoint(context, after, (uint8_t *)debugger); - debugging = 0; - break; - case 's': - if (inst.op == M68K_RTS) { - after = (read_dma_value(context->aregs[7]/2) << 16) | read_dma_value(context->aregs[7]/2 + 1); - } else if (inst.op == M68K_RTE || inst.op == M68K_RTR) { - after = (read_dma_value((context->aregs[7]+2)/2) << 16) | read_dma_value((context->aregs[7]+2)/2 + 1); - } else if(m68k_is_branch(&inst)) { - if (inst.op == M68K_BCC && inst.extra.cond != COND_TRUE) { - branch_f = after; - branch_t = m68k_branch_target(&inst, context->dregs, context->aregs); - insert_breakpoint(context, branch_t, (uint8_t *)debugger); - } else if(inst.op == M68K_DBCC && inst.extra.cond != COND_FALSE) { - branch_t = after; - branch_f = m68k_branch_target(&inst, context->dregs, context->aregs); - insert_breakpoint(context, branch_f, (uint8_t *)debugger); - } else { - after = m68k_branch_target(&inst, context->dregs, context->aregs); - } - } - insert_breakpoint(context, after, (uint8_t *)debugger); - debugging = 0; - break; - case 'v': { - genesis_context * gen = context->system; - //VDP debug commands - switch(input_buf[1]) - { - case 's': - vdp_print_sprite_table(gen->vdp); - break; - case 'r': - vdp_print_reg_explain(gen->vdp); - break; - } - break; - } - case 'z': { - genesis_context * gen = context->system; - //Z80 debug commands - switch(input_buf[1]) - { - case 'b': - param = find_param(input_buf); - if (!param) { - fputs("zb command requires a parameter\n", stderr); - break; - } - value = strtol(param, NULL, 16); - zinsert_breakpoint(gen->z80, value, (uint8_t *)zdebugger); - new_bp = malloc(sizeof(bp_def)); - new_bp->next = zbreakpoints; - new_bp->address = value; - new_bp->index = zbp_index++; - zbreakpoints = new_bp; - printf("Z80 Breakpoint %d set at %X\n", new_bp->index, value); - break; - case 'p': - param = find_param(input_buf); - if (!param) { - fputs("zp command requires a parameter\n", stderr); - break; - } - zdebugger_print(gen->z80, input_buf[2] == '/' ? input_buf[3] : 0, param); - } - break; - } - case 'q': - puts("Quitting"); - exit(0); - break; - default: - fprintf(stderr, "Unrecognized debugger command %s\n", input_buf); - break; - } - } - return context; -} - void set_speed_percent(genesis_context * context, uint32_t percent) { uint32_t old_clock = context->master_clock;
--- a/blastem.h Tue Feb 11 21:52:15 2014 -0800 +++ b/blastem.h Tue Feb 11 21:53:31 2014 -0800 @@ -45,6 +45,14 @@ extern uint8_t busreq; extern uint8_t reset; +#define CARTRIDGE_WORDS 0x200000 +#define RAM_WORDS 32 * 1024 +#define Z80_RAM_BYTES 8 * 1024 + +extern uint16_t cart[CARTRIDGE_WORDS]; +extern uint16_t ram[RAM_WORDS]; +extern uint8_t z80_ram[Z80_RAM_BYTES]; + uint16_t read_dma_value(uint32_t address); m68k_context * debugger(m68k_context * context, uint32_t address); void set_speed_percent(genesis_context * context, uint32_t percent);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debug.c Tue Feb 11 21:53:31 2014 -0800 @@ -0,0 +1,744 @@ +#include "debug.h" +#include "blastem.h" +#include "68kinst.h" +#include <stdlib.h> +#include <string.h> + +bp_def * breakpoints = NULL; +bp_def * zbreakpoints = NULL; +uint32_t bp_index = 0; +uint32_t zbp_index = 0; + +bp_def ** find_breakpoint(bp_def ** cur, uint32_t address) +{ + while (*cur) { + if ((*cur)->address == address) { + break; + } + cur = &((*cur)->next); + } + return cur; +} + +bp_def ** find_breakpoint_idx(bp_def ** cur, uint32_t index) +{ + while (*cur) { + if ((*cur)->index == index) { + break; + } + cur = &((*cur)->next); + } + return cur; +} + +disp_def * displays = NULL; +disp_def * zdisplays = NULL; +uint32_t disp_index = 0; +uint32_t zdisp_index = 0; + +void add_display(disp_def ** head, uint32_t *index, char format_char, char * param) +{ + disp_def * ndisp = malloc(sizeof(*ndisp)); + ndisp->format_char = format_char; + ndisp->param = strdup(param); + ndisp->next = *head; + ndisp->index = *index++; + *head = ndisp; +} + +void remove_display(disp_def ** head, uint32_t index) +{ + while (*head) { + if ((*head)->index == index) { + disp_def * del_disp = *head; + *head = del_disp->next; + free(del_disp->param); + free(del_disp); + } else { + head = &(*head)->next; + } + } +} + +char * find_param(char * buf) +{ + for (; *buf; buf++) { + if (*buf == ' ') { + if (*(buf+1)) { + return buf+1; + } + } + } + return NULL; +} + +void strip_nl(char * buf) +{ + for(; *buf; buf++) { + if (*buf == '\n') { + *buf = 0; + return; + } + } +} + +void zdebugger_print(z80_context * context, char format_char, char * param) +{ + uint32_t value; + char format[8]; + strcpy(format, "%s: %d\n"); + switch (format_char) + { + case 'x': + case 'X': + case 'd': + case 'c': + format[5] = format_char; + break; + case '\0': + break; + default: + fprintf(stderr, "Unrecognized format character: %c\n", format_char); + } + switch (param[0]) + { + case 'a': + if (param[1] == 'f') { + if(param[2] == '\'') { + value = context->alt_regs[Z80_A] << 8; + value |= context->alt_flags[ZF_S] << 7; + value |= context->alt_flags[ZF_Z] << 6; + value |= context->alt_flags[ZF_H] << 4; + value |= context->alt_flags[ZF_PV] << 2; + value |= context->alt_flags[ZF_N] << 1; + value |= context->alt_flags[ZF_C]; + } else { + value = context->regs[Z80_A] << 8; + value |= context->flags[ZF_S] << 7; + value |= context->flags[ZF_Z] << 6; + value |= context->flags[ZF_H] << 4; + value |= context->flags[ZF_PV] << 2; + value |= context->flags[ZF_N] << 1; + value |= context->flags[ZF_C]; + } + } else if(param[1] == '\'') { + value = context->alt_regs[Z80_A]; + } else { + value = context->regs[Z80_A]; + } + break; + case 'b': + if (param[1] == 'c') { + if(param[2] == '\'') { + value = context->alt_regs[Z80_B] << 8; + value |= context->alt_regs[Z80_C]; + } else { + value = context->regs[Z80_B] << 8; + value |= context->regs[Z80_C]; + } + } else if(param[1] == '\'') { + value = context->alt_regs[Z80_B]; + } else if(param[1] == 'a') { + value = context->bank_reg << 15; + } else { + value = context->regs[Z80_B]; + } + break; + case 'c': + if(param[1] == '\'') { + value = context->alt_regs[Z80_C]; + } else if(param[1] == 'y') { + value = context->current_cycle; + } else { + value = context->regs[Z80_C]; + } + break; + case 'd': + if (param[1] == 'e') { + if(param[2] == '\'') { + value = context->alt_regs[Z80_D] << 8; + value |= context->alt_regs[Z80_E]; + } else { + value = context->regs[Z80_D] << 8; + value |= context->regs[Z80_E]; + } + } else if(param[1] == '\'') { + value = context->alt_regs[Z80_D]; + } else { + value = context->regs[Z80_D]; + } + break; + case 'e': + if(param[1] == '\'') { + value = context->alt_regs[Z80_E]; + } else { + value = context->regs[Z80_E]; + } + break; + case 'f': + if(param[2] == '\'') { + value = context->alt_flags[ZF_S] << 7; + value |= context->alt_flags[ZF_Z] << 6; + value |= context->alt_flags[ZF_H] << 4; + value |= context->alt_flags[ZF_PV] << 2; + value |= context->alt_flags[ZF_N] << 1; + value |= context->alt_flags[ZF_C]; + } else { + value = context->flags[ZF_S] << 7; + value |= context->flags[ZF_Z] << 6; + value |= context->flags[ZF_H] << 4; + value |= context->flags[ZF_PV] << 2; + value |= context->flags[ZF_N] << 1; + value |= context->flags[ZF_C]; + } + break; + case 'h': + if (param[1] == 'l') { + if(param[2] == '\'') { + value = context->alt_regs[Z80_H] << 8; + value |= context->alt_regs[Z80_L]; + } else { + value = context->regs[Z80_H] << 8; + value |= context->regs[Z80_L]; + } + } else if(param[1] == '\'') { + value = context->alt_regs[Z80_H]; + } else { + value = context->regs[Z80_H]; + } + break; + case 'l': + if(param[1] == '\'') { + value = context->alt_regs[Z80_L]; + } else { + value = context->regs[Z80_L]; + } + break; + case 'i': + if(param[1] == 'x') { + if (param[2] == 'h') { + value = context->regs[Z80_IXH]; + } else if(param[2] == 'l') { + value = context->regs[Z80_IXL]; + } else { + value = context->regs[Z80_IXH] << 8; + value |= context->regs[Z80_IXL]; + } + } else if(param[1] == 'y') { + if (param[2] == 'h') { + value = context->regs[Z80_IYH]; + } else if(param[2] == 'l') { + value = context->regs[Z80_IYL]; + } else { + value = context->regs[Z80_IYH] << 8; + value |= context->regs[Z80_IYL]; + } + } else if(param[1] == 'n') { + value = context->int_cycle; + } else if(param[1] == 'f' && param[2] == 'f' && param[3] == '1') { + value = context->iff1; + } else if(param[1] == 'f' && param[2] == 'f' && param[3] == '2') { + value = context->iff2; + } else { + value = context->im; + } + break; + case 's': + if (param[1] == 'p') { + value = context->sp; + } + break; + case '0': + if (param[1] == 'x') { + uint16_t p_addr = strtol(param+2, NULL, 16); + if (p_addr < 0x4000) { + value = z80_ram[p_addr & 0x1FFF]; + } else if(p_addr >= 0x8000) { + uint32_t v_addr = context->bank_reg << 15; + v_addr += p_addr & 0x7FFF; + if (v_addr < 0x400000) { + value = cart[v_addr/2]; + } else if(v_addr > 0xE00000) { + value = ram[(v_addr & 0xFFFF)/2]; + } + if (v_addr & 1) { + value &= 0xFF; + } else { + value >>= 8; + } + } + } + break; + } + printf(format, param, value); +} + +z80_context * zdebugger(z80_context * context, uint16_t address) +{ + static char last_cmd[1024]; + char input_buf[1024]; + static uint16_t branch_t; + static uint16_t branch_f; + z80inst inst; + //Check if this is a user set breakpoint, or just a temporary one + bp_def ** this_bp = find_breakpoint(&zbreakpoints, address); + if (*this_bp) { + printf("Z80 Breakpoint %d hit\n", (*this_bp)->index); + } else { + zremove_breakpoint(context, address); + } + uint8_t * pc; + if (address < 0x4000) { + pc = z80_ram + (address & 0x1FFF); + } else if (address >= 0x8000) { + if (context->bank_reg < (0x400000 >> 15)) { + fprintf(stderr, "Entered Z80 debugger in banked memory address %X, which is not yet supported\n", address); + exit(1); + } else { + fprintf(stderr, "Entered Z80 debugger in banked memory address %X, but the bank is not pointed to a cartridge address\n", address); + exit(1); + } + } else { + fprintf(stderr, "Entered Z80 debugger at address %X\n", address); + exit(1); + } + for (disp_def * cur = zdisplays; cur; cur = cur->next) { + zdebugger_print(context, cur->format_char, cur->param); + } + uint8_t * after_pc = z80_decode(pc, &inst); + z80_disasm(&inst, input_buf, address); + printf("%X:\t%s\n", address, input_buf); + uint16_t after = address + (after_pc-pc); + int debugging = 1; + while(debugging) { + fputs(">", stdout); + if (!fgets(input_buf, sizeof(input_buf), stdin)) { + fputs("fgets failed", stderr); + break; + } + strip_nl(input_buf); + //hitting enter repeats last command + if (input_buf[0]) { + strcpy(last_cmd, input_buf); + } else { + strcpy(input_buf, last_cmd); + } + char * param; + char format[8]; + uint32_t value; + bp_def * new_bp; + switch(input_buf[0]) + { + case 'a': + param = find_param(input_buf); + if (!param) { + fputs("a command requires a parameter\n", stderr); + break; + } + value = strtol(param, NULL, 16); + zinsert_breakpoint(context, value, (uint8_t *)zdebugger); + debugging = 0; + break; + case 'b': + param = find_param(input_buf); + if (!param) { + fputs("b command requires a parameter\n", stderr); + break; + } + value = strtol(param, NULL, 16); + zinsert_breakpoint(context, value, (uint8_t *)zdebugger); + new_bp = malloc(sizeof(bp_def)); + new_bp->next = zbreakpoints; + new_bp->address = value; + new_bp->index = zbp_index++; + zbreakpoints = new_bp; + printf("Z80 Breakpoint %d set at %X\n", new_bp->index, value); + break; + case 'c': + puts("Continuing"); + debugging = 0; + break; + case 'd': + if (input_buf[1] == 'i') { + char format_char = 0; + for(int i = 2; input_buf[i] != 0 && input_buf[i] != ' '; i++) { + if (input_buf[i] == '/') { + format_char = input_buf[i+1]; + break; + } + } + param = find_param(input_buf); + if (!param) { + fputs("display command requires a parameter\n", stderr); + break; + } + zdebugger_print(context, format_char, param); + add_display(&zdisplays, &zdisp_index, format_char, param); + } else if (input_buf[1] == 'e' || input_buf[1] == ' ') { + param = find_param(input_buf); + if (!param) { + fputs("delete command requires a parameter\n", stderr); + break; + } + if (param[0] >= '0' && param[0] <= '9') { + value = atoi(param); + this_bp = find_breakpoint_idx(&zbreakpoints, value); + if (!*this_bp) { + fprintf(stderr, "Breakpoint %d does not exist\n", value); + break; + } + new_bp = *this_bp; + zremove_breakpoint(context, new_bp->address); + *this_bp = new_bp->next; + free(new_bp); + } else if (param[0] == 'd') { + param = find_param(param); + if (!param) { + fputs("delete display command requires a parameter\n", stderr); + break; + } + remove_display(&zdisplays, atoi(param)); + } + } + break; + case 'n': + //TODO: Handle conditional branch instructions + if (inst.op == Z80_JP) { + if (inst.addr_mode == Z80_IMMED) { + after = inst.immed; + } else if (inst.ea_reg == Z80_HL) { + after = context->regs[Z80_H] << 8 | context->regs[Z80_L]; + } else if (inst.ea_reg == Z80_IX) { + after = context->regs[Z80_IXH] << 8 | context->regs[Z80_IXL]; + } else if (inst.ea_reg == Z80_IY) { + after = context->regs[Z80_IYH] << 8 | context->regs[Z80_IYL]; + } + } else if(inst.op == Z80_JR) { + after += inst.immed; + } else if(inst.op == Z80_RET) { + if (context->sp < 0x4000) { + after = z80_ram[context->sp & 0x1FFF] | z80_ram[(context->sp+1) & 0x1FFF] << 8; + } + } + zinsert_breakpoint(context, after, (uint8_t *)zdebugger); + debugging = 0; + break; + case 'p': + param = find_param(input_buf); + if (!param) { + fputs("p command requires a parameter\n", stderr); + break; + } + zdebugger_print(context, input_buf[1] == '/' ? input_buf[2] : 0, param); + break; + case 'q': + puts("Quitting"); + exit(0); + break; + case 's': { + param = find_param(input_buf); + if (!param) { + fputs("s command requires a file name\n", stderr); + break; + } + FILE * f = fopen(param, "wb"); + if (f) { + if(fwrite(z80_ram, 1, sizeof(z80_ram), f) != sizeof(z80_ram)) { + fputs("Error writing file\n", stderr); + } + fclose(f); + } else { + fprintf(stderr, "Could not open %s for writing\n", param); + } + break; + } + default: + fprintf(stderr, "Unrecognized debugger command %s\n", input_buf); + break; + } + } + return context; +} + +m68k_context * debugger(m68k_context * context, uint32_t address) +{ + static char last_cmd[1024]; + char input_buf[1024]; + static uint32_t branch_t; + static uint32_t branch_f; + m68kinst inst; + //probably not necessary, but let's play it safe + address &= 0xFFFFFF; + if (address == branch_t) { + bp_def ** f_bp = find_breakpoint(&breakpoints, branch_f); + if (!*f_bp) { + remove_breakpoint(context, branch_f); + } + branch_t = branch_f = 0; + } else if(address == branch_f) { + bp_def ** t_bp = find_breakpoint(&breakpoints, branch_t); + if (!*t_bp) { + remove_breakpoint(context, branch_t); + } + branch_t = branch_f = 0; + } + //Check if this is a user set breakpoint, or just a temporary one + bp_def ** this_bp = find_breakpoint(&breakpoints, address); + if (*this_bp) { + printf("68K Breakpoint %d hit\n", (*this_bp)->index); + } else { + remove_breakpoint(context, address); + } + uint16_t * pc; + if (address < 0x400000) { + pc = cart + address/2; + } else if(address > 0xE00000) { + pc = ram + (address & 0xFFFF)/2; + } else { + fprintf(stderr, "Entered 68K debugger at address %X\n", address); + exit(1); + } + uint16_t * after_pc = m68k_decode(pc, &inst, address); + m68k_disasm(&inst, input_buf); + printf("%X: %s\n", address, input_buf); + uint32_t after = address + (after_pc-pc)*2; + int debugging = 1; + while (debugging) { + fputs(">", stdout); + if (!fgets(input_buf, sizeof(input_buf), stdin)) { + fputs("fgets failed", stderr); + break; + } + strip_nl(input_buf); + //hitting enter repeats last command + if (input_buf[0]) { + strcpy(last_cmd, input_buf); + } else { + strcpy(input_buf, last_cmd); + } + char * param; + char format[8]; + uint32_t value; + bp_def * new_bp; + switch(input_buf[0]) + { + case 'c': + puts("Continuing"); + debugging = 0; + break; + case 'b': + param = find_param(input_buf); + if (!param) { + fputs("b command requires a parameter\n", stderr); + break; + } + value = strtol(param, NULL, 16); + insert_breakpoint(context, value, (uint8_t *)debugger); + new_bp = malloc(sizeof(bp_def)); + new_bp->next = breakpoints; + new_bp->address = value; + new_bp->index = bp_index++; + breakpoints = new_bp; + printf("68K Breakpoint %d set at %X\n", new_bp->index, value); + break; + case 'a': + param = find_param(input_buf); + if (!param) { + fputs("a command requires a parameter\n", stderr); + break; + } + value = strtol(param, NULL, 16); + insert_breakpoint(context, value, (uint8_t *)debugger); + debugging = 0; + break; + case 'd': + param = find_param(input_buf); + if (!param) { + fputs("d command requires a parameter\n", stderr); + break; + } + value = atoi(param); + this_bp = find_breakpoint_idx(&breakpoints, value); + if (!*this_bp) { + fprintf(stderr, "Breakpoint %d does not exist\n", value); + break; + } + new_bp = *this_bp; + *this_bp = (*this_bp)->next; + free(new_bp); + break; + case 'p': + strcpy(format, "%s: %d\n"); + if (input_buf[1] == '/') { + switch (input_buf[2]) + { + case 'x': + case 'X': + case 'd': + case 'c': + format[5] = input_buf[2]; + break; + default: + fprintf(stderr, "Unrecognized format character: %c\n", input_buf[2]); + } + } + param = find_param(input_buf); + if (!param) { + fputs("p command requires a parameter\n", stderr); + break; + } + if (param[0] == 'd' && param[1] >= '0' && param[1] <= '7') { + value = context->dregs[param[1]-'0']; + } else if (param[0] == 'a' && param[1] >= '0' && param[1] <= '7') { + value = context->aregs[param[1]-'0']; + } else if (param[0] == 'S' && param[1] == 'R') { + value = (context->status << 8); + for (int flag = 0; flag < 5; flag++) { + value |= context->flags[flag] << (4-flag); + } + } else if(param[0] == 'c') { + value = context->current_cycle; + } else if (param[0] == '0' && param[1] == 'x') { + uint32_t p_addr = strtol(param+2, NULL, 16); + value = read_dma_value(p_addr/2); + } else { + fprintf(stderr, "Unrecognized parameter to p: %s\n", param); + break; + } + printf(format, param, value); + break; + case 'n': + if (inst.op == M68K_RTS) { + after = (read_dma_value(context->aregs[7]/2) << 16) | read_dma_value(context->aregs[7]/2 + 1); + } else if (inst.op == M68K_RTE || inst.op == M68K_RTR) { + after = (read_dma_value((context->aregs[7]+2)/2) << 16) | read_dma_value((context->aregs[7]+2)/2 + 1); + } else if(m68k_is_noncall_branch(&inst)) { + if (inst.op == M68K_BCC && inst.extra.cond != COND_TRUE) { + branch_f = after; + branch_t = m68k_branch_target(&inst, context->dregs, context->aregs); + insert_breakpoint(context, branch_t, (uint8_t *)debugger); + } else if(inst.op == M68K_DBCC) { + if ( inst.extra.cond == COND_FALSE) { + if (context->dregs[inst.dst.params.regs.pri] & 0xFFFF) { + after = m68k_branch_target(&inst, context->dregs, context->aregs); + } + } else { + branch_t = after; + branch_f = m68k_branch_target(&inst, context->dregs, context->aregs); + insert_breakpoint(context, branch_f, (uint8_t *)debugger); + } + } else { + after = m68k_branch_target(&inst, context->dregs, context->aregs); + } + } + insert_breakpoint(context, after, (uint8_t *)debugger); + debugging = 0; + break; + case 'o': + if (inst.op == M68K_RTS) { + after = (read_dma_value(context->aregs[7]/2) << 16) | read_dma_value(context->aregs[7]/2 + 1); + } else if (inst.op == M68K_RTE || inst.op == M68K_RTR) { + after = (read_dma_value((context->aregs[7]+2)/2) << 16) | read_dma_value((context->aregs[7]+2)/2 + 1); + } else if(m68k_is_noncall_branch(&inst)) { + if (inst.op == M68K_BCC && inst.extra.cond != COND_TRUE) { + branch_t = m68k_branch_target(&inst, context->dregs, context->aregs) & 0xFFFFFF; + if (branch_t < after) { + branch_t = 0; + } else { + branch_f = after; + insert_breakpoint(context, branch_t, (uint8_t *)debugger); + } + } else if(inst.op == M68K_DBCC) { + uint32_t target = m68k_branch_target(&inst, context->dregs, context->aregs) & 0xFFFFFF; + if (target > after) { + if (inst.extra.cond == COND_FALSE) { + after = target; + } else { + branch_f = target; + branch_t = after; + insert_breakpoint(context, branch_f, (uint8_t *)debugger); + } + } + } else { + after = m68k_branch_target(&inst, context->dregs, context->aregs) & 0xFFFFFF; + } + } + insert_breakpoint(context, after, (uint8_t *)debugger); + debugging = 0; + break; + case 's': + if (inst.op == M68K_RTS) { + after = (read_dma_value(context->aregs[7]/2) << 16) | read_dma_value(context->aregs[7]/2 + 1); + } else if (inst.op == M68K_RTE || inst.op == M68K_RTR) { + after = (read_dma_value((context->aregs[7]+2)/2) << 16) | read_dma_value((context->aregs[7]+2)/2 + 1); + } else if(m68k_is_branch(&inst)) { + if (inst.op == M68K_BCC && inst.extra.cond != COND_TRUE) { + branch_f = after; + branch_t = m68k_branch_target(&inst, context->dregs, context->aregs) & 0xFFFFFF; + insert_breakpoint(context, branch_t, (uint8_t *)debugger); + } else if(inst.op == M68K_DBCC && inst.extra.cond != COND_FALSE) { + branch_t = after; + branch_f = m68k_branch_target(&inst, context->dregs, context->aregs) & 0xFFFFFF; + insert_breakpoint(context, branch_f, (uint8_t *)debugger); + } else { + after = m68k_branch_target(&inst, context->dregs, context->aregs) & 0xFFFFFF; + } + } + insert_breakpoint(context, after, (uint8_t *)debugger); + debugging = 0; + break; + case 'v': { + genesis_context * gen = context->system; + //VDP debug commands + switch(input_buf[1]) + { + case 's': + vdp_print_sprite_table(gen->vdp); + break; + case 'r': + vdp_print_reg_explain(gen->vdp); + break; + } + break; + } + case 'z': { + genesis_context * gen = context->system; + //Z80 debug commands + switch(input_buf[1]) + { + case 'b': + param = find_param(input_buf); + if (!param) { + fputs("zb command requires a parameter\n", stderr); + break; + } + value = strtol(param, NULL, 16); + zinsert_breakpoint(gen->z80, value, (uint8_t *)zdebugger); + new_bp = malloc(sizeof(bp_def)); + new_bp->next = zbreakpoints; + new_bp->address = value; + new_bp->index = zbp_index++; + zbreakpoints = new_bp; + printf("Z80 Breakpoint %d set at %X\n", new_bp->index, value); + break; + case 'p': + param = find_param(input_buf); + if (!param) { + fputs("zp command requires a parameter\n", stderr); + break; + } + zdebugger_print(gen->z80, input_buf[2] == '/' ? input_buf[3] : 0, param); + } + break; + } + case 'q': + puts("Quitting"); + exit(0); + break; + default: + fprintf(stderr, "Unrecognized debugger command %s\n", input_buf); + break; + } + } + return context; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debug.h Tue Feb 11 21:53:31 2014 -0800 @@ -0,0 +1,26 @@ +#ifndef DEBUG_H_ +#define DEBUG_H_ + +#include <stdint.h> +#include "m68k_to_x86.h" + +typedef struct disp_def { + struct disp_def * next; + char * param; + uint32_t index; + char format_char; +} disp_def; + +typedef struct bp_def { + struct bp_def * next; + uint32_t address; + uint32_t index; +} bp_def; + +bp_def ** find_breakpoint(bp_def ** cur, uint32_t address); +bp_def ** find_breakpoint_idx(bp_def ** cur, uint32_t index); +void add_display(disp_def ** head, uint32_t *index, char format_char, char * param); +void remove_display(disp_def ** head, uint32_t index); +m68k_context * debugger(m68k_context * context, uint32_t address); + +#endif //DEBUG_H_