From 8dd1b3c85427384d2b4c90658b105881a3d3aeef Mon Sep 17 00:00:00 2001 From: Lior Halphon Date: Sun, 10 Apr 2016 23:22:54 +0300 Subject: [PATCH] Added (experimental) stack-leak and stack-overflow detection command to the debugger. --- Core/debugger.c | 43 +++++++++++++++++++++++++++++++++++++++++++ Core/gb.h | 4 ++++ 2 files changed, 47 insertions(+) diff --git a/Core/debugger.c b/Core/debugger.c index 0ac7a3d..ba1bf14 100644 --- a/Core/debugger.c +++ b/Core/debugger.c @@ -378,6 +378,19 @@ static bool finish(GB_gameboy_t *gb, char *arguments) return false; } +static bool stack_leak_detection(GB_gameboy_t *gb, char *arguments) +{ + if (strlen(lstrip(arguments))) { + gb_log(gb, "Usage: sld\n"); + return true; + } + + gb->debug_stopped = false; + gb->stack_leak_detection = true; + gb->debug_call_depth = 0; + return false; +} + static bool registers(GB_gameboy_t *gb, char *arguments) { if (strlen(lstrip(arguments))) { @@ -589,6 +602,7 @@ static const debugger_command_t commands[] = { {"next", 1, next, "Run the next instruction, skipping over function calls"}, {"step", 1, step, "Run the next instruction, stepping into function calls"}, {"finish", 1, finish, "Run until the current function returns"}, + {"sld", 3, stack_leak_detection, "Run until the current function returns, or a stack leak is detected (Experimental)"}, {"registers", 1, registers, "Print values of processor registers and other important registers"}, {"cartridge", 2, mbc, "Displays information about the MBC and cartridge"}, {"mbc", 3, mbc, NULL}, @@ -632,13 +646,41 @@ static const debugger_command_t *find_command(const char *string) void debugger_call_hook(GB_gameboy_t *gb) { /* Called just after the CPU calls a function/enters an interrupt/etc... */ + + if (gb->stack_leak_detection) { + if (gb->debug_call_depth >= sizeof(gb->sp_for_call_depth) / sizeof(gb->sp_for_call_depth[0])) { + gb_log(gb, "Potential stack overflow detected (Functions nest too much). \n"); + gb->debug_stopped = true; + } + else { + gb->sp_for_call_depth[gb->debug_call_depth] = gb->registers[GB_REGISTER_SP]; + gb->addr_for_call_depth[gb->debug_call_depth] = gb->pc; + } + } + gb->debug_call_depth++; } void debugger_ret_hook(GB_gameboy_t *gb) { /* Called just before the CPU runs ret/reti */ + gb->debug_call_depth--; + + if (gb->stack_leak_detection) { + if (gb->debug_call_depth < 0) { + gb_log(gb, "Function finished without a stack leak.\n"); + gb->debug_stopped = true; + } + else { + if (gb->registers[GB_REGISTER_SP] != gb->sp_for_call_depth[gb->debug_call_depth]) { + gb_log(gb, "Stack leak detected for function %04x!\n", gb->addr_for_call_depth[gb->debug_call_depth]); + gb_log(gb, "SP is %04x, should be %04x.\n", gb->registers[GB_REGISTER_SP], + gb->sp_for_call_depth[gb->debug_call_depth]); + gb->debug_stopped = true; + } + } + } } /* The debugger interface is quite primitive. One letter commands with a single parameter maximum. @@ -667,6 +709,7 @@ next_command: if (gb->debug_stopped) { gb->debug_next_command = false; gb->debug_fin_command = false; + gb->stack_leak_detection = false; input = gb->input_callback(gb); if (!input[0]) { goto next_command; diff --git a/Core/gb.h b/Core/gb.h index cf14078..9140da8 100644 --- a/Core/gb.h +++ b/Core/gb.h @@ -279,6 +279,10 @@ typedef struct GB_gameboy_s{ unsigned short n_breakpoints; unsigned short *breakpoints; + bool stack_leak_detection; + unsigned short sp_for_call_depth[0x200]; /* Should be much more than enough */ + unsigned short addr_for_call_depth[0x200]; + } GB_gameboy_t; #ifndef __printflike