Max
/
SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: Conditional read watchpoints crashed if the expression referred to the 'new' variable. Breakpoint and watchpoint conditions no longer trigger watchpoints.

This commit is contained in:
Lior Halphon 2017-01-12 23:11:26 +02:00
parent 8c14ec3268
commit cd382ef236
1 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
Core/debugger.c
View File

@ -425,6 +425,12 @@ value_t debugger_evaluate(GB_gameboy_t *gb, const char *string,
size_t length, bool *error, size_t length, bool *error,
uint16_t *watchpoint_address, uint8_t *watchpoint_new_value) uint16_t *watchpoint_address, uint8_t *watchpoint_new_value)
{ {
/* Disable watchpoints while evaulating expressions */
uint16_t n_watchpoints = gb->n_watchpoints;
gb->n_watchpoints = 0;
value_t ret = ERROR;
*error = false; *error = false;
// Strip whitespace // Strip whitespace
while (length && (string[0] == ' ' || string[0] == '\n' || string[0] == '\r' || string[0] == '\t')) { while (length && (string[0] == ' ' || string[0] == '\n' || string[0] == '\r' || string[0] == '\t')) {
@ -438,7 +444,7 @@ value_t debugger_evaluate(GB_gameboy_t *gb, const char *string,
{ {
GB_log(gb, "Expected expression.\n"); GB_log(gb, "Expected expression.\n");
*error = true; *error = true;
return ERROR; goto exit;
} }
if (string[0] == '(' && string[length - 1] == ')') { if (string[0] == '(' && string[length - 1] == ')') {
// Attempt to strip parentheses // Attempt to strip parentheses
@ -452,7 +458,10 @@ value_t debugger_evaluate(GB_gameboy_t *gb, const char *string,
} }
if (string[i] == ')') depth--; if (string[i] == ')') depth--;
} }
if (depth == 0) return debugger_evaluate(gb, string + 1, length - 2, error, watchpoint_address, watchpoint_new_value); if (depth == 0) {
ret = debugger_evaluate(gb, string + 1, length - 2, error, watchpoint_address, watchpoint_new_value);
goto exit;
}
} }
else if (string[0] == '[' && string[length - 1] == ']') { else if (string[0] == '[' && string[length - 1] == ']') {
// Attempt to strip square parentheses (memory dereference) // Attempt to strip square parentheses (memory dereference)
@ -471,14 +480,14 @@ value_t debugger_evaluate(GB_gameboy_t *gb, const char *string,
value_t addr = debugger_evaluate(gb, string + 1, length - 2, error, watchpoint_address, watchpoint_new_value); value_t addr = debugger_evaluate(gb, string + 1, length - 2, error, watchpoint_address, watchpoint_new_value);
banking_state_t state; banking_state_t state;
if (addr.bank) { if (addr.bank) {
save_banking_state(gb, &state); save_banking_state(gb, &state);
switch_banking_state(gb, addr.bank); switch_banking_state(gb, addr.bank);
} }
value_t r = VALUE_16(GB_read_memory(gb, addr.value)); ret = VALUE_16(GB_read_memory(gb, addr.value));
if (addr.bank) { if (addr.bank) {
restore_banking_state(gb, &state); restore_banking_state(gb, &state);
} }
return r; goto exit;
} }
} }
@ -511,15 +520,17 @@ value_t debugger_evaluate(GB_gameboy_t *gb, const char *string,
if (operator_index != -1) { if (operator_index != -1) {
unsigned int right_start = (unsigned int)(operator_pos + strlen(operators[operator_index].string)); unsigned int right_start = (unsigned int)(operator_pos + strlen(operators[operator_index].string));
value_t right = debugger_evaluate(gb, string + right_start, length - right_start, error, watchpoint_address, watchpoint_new_value); value_t right = debugger_evaluate(gb, string + right_start, length - right_start, error, watchpoint_address, watchpoint_new_value);
if (*error) return ERROR; if (*error) goto exit;
if (operators[operator_index].lvalue_operator) { if (operators[operator_index].lvalue_operator) {
lvalue_t left = debugger_evaluate_lvalue(gb, string, operator_pos, error, watchpoint_address, watchpoint_new_value); lvalue_t left = debugger_evaluate_lvalue(gb, string, operator_pos, error, watchpoint_address, watchpoint_new_value);
if (*error) return ERROR; if (*error) goto exit;
return operators[operator_index].lvalue_operator(gb, left, right.value); ret = operators[operator_index].lvalue_operator(gb, left, right.value);
goto exit;
} }
value_t left = debugger_evaluate(gb, string, operator_pos, error, watchpoint_address, watchpoint_new_value); value_t left = debugger_evaluate(gb, string, operator_pos, error, watchpoint_address, watchpoint_new_value);
if (*error) return ERROR; if (*error) goto exit;
return operators[operator_index].operator(left, right); ret = operators[operator_index].operator(left, right);
goto exit;
} }
// Not an expression - must be a register or a literal // Not an expression - must be a register or a literal
@ -528,38 +539,41 @@ value_t debugger_evaluate(GB_gameboy_t *gb, const char *string,
if (string[0] != '$' && (string[0] < '0' || string[0] > '9')) { if (string[0] != '$' && (string[0] < '0' || string[0] > '9')) {
if (length == 1) { if (length == 1) {
switch (string[0]) { switch (string[0]) {
case 'a': return VALUE_16(gb->registers[GB_REGISTER_AF] >> 8); case 'a': ret = VALUE_16(gb->registers[GB_REGISTER_AF] >> 8); goto exit;
case 'f': return VALUE_16(gb->registers[GB_REGISTER_AF] & 0xFF); case 'f': ret = VALUE_16(gb->registers[GB_REGISTER_AF] & 0xFF); goto exit;
case 'b': return VALUE_16(gb->registers[GB_REGISTER_BC] >> 8); case 'b': ret = VALUE_16(gb->registers[GB_REGISTER_BC] >> 8); goto exit;
case 'c': return VALUE_16(gb->registers[GB_REGISTER_BC] & 0xFF); case 'c': ret = VALUE_16(gb->registers[GB_REGISTER_BC] & 0xFF); goto exit;
case 'd': return VALUE_16(gb->registers[GB_REGISTER_DE] >> 8); case 'd': ret = VALUE_16(gb->registers[GB_REGISTER_DE] >> 8); goto exit;
case 'e': return VALUE_16(gb->registers[GB_REGISTER_DE] & 0xFF); case 'e': ret = VALUE_16(gb->registers[GB_REGISTER_DE] & 0xFF); goto exit;
case 'h': return VALUE_16(gb->registers[GB_REGISTER_HL] >> 8); case 'h': ret = VALUE_16(gb->registers[GB_REGISTER_HL] >> 8); goto exit;
case 'l': return VALUE_16(gb->registers[GB_REGISTER_HL] & 0xFF); case 'l': ret = VALUE_16(gb->registers[GB_REGISTER_HL] & 0xFF); goto exit;
} }
} }
else if (length == 2) { else if (length == 2) {
switch (string[0]) { switch (string[0]) {
case 'a': if (string[1] == 'f') return VALUE_16(gb->registers[GB_REGISTER_AF]); case 'a': if (string[1] == 'f') {ret = VALUE_16(gb->registers[GB_REGISTER_AF]); goto exit;}
case 'b': if (string[1] == 'c') return VALUE_16(gb->registers[GB_REGISTER_BC]); case 'b': if (string[1] == 'c') {ret = VALUE_16(gb->registers[GB_REGISTER_BC]); goto exit;}
case 'd': if (string[1] == 'e') return VALUE_16(gb->registers[GB_REGISTER_DE]); case 'd': if (string[1] == 'e') {ret = VALUE_16(gb->registers[GB_REGISTER_DE]); goto exit;}
case 'h': if (string[1] == 'l') return VALUE_16(gb->registers[GB_REGISTER_HL]); case 'h': if (string[1] == 'l') {ret = VALUE_16(gb->registers[GB_REGISTER_HL]); goto exit;}
case 's': if (string[1] == 'p') return VALUE_16(gb->registers[GB_REGISTER_SP]); case 's': if (string[1] == 'p') {ret = VALUE_16(gb->registers[GB_REGISTER_SP]); goto exit;}
case 'p': if (string[1] == 'c') return (value_t){true, bank_for_addr(gb, gb->pc), gb->pc}; case 'p': if (string[1] == 'c') {ret = (value_t){true, bank_for_addr(gb, gb->pc), gb->pc}; goto exit;}
} }
} }
else if (length == 3) { else if (length == 3) {
if (watchpoint_address && memcmp(string, "old", 3) == 0) { if (watchpoint_address && memcmp(string, "old", 3) == 0) {
return VALUE_16(GB_read_memory(gb, *watchpoint_address)); ret = VALUE_16(GB_read_memory(gb, *watchpoint_address));
goto exit;
} }
if (watchpoint_new_value && memcmp(string, "new", 3) == 0) { if (watchpoint_new_value && memcmp(string, "new", 3) == 0) {
return VALUE_16(*watchpoint_new_value); ret = VALUE_16(*watchpoint_new_value);
goto exit;
} }
/* $new is identical to $old in read conditions */ /* $new is identical to $old in read conditions */
if (watchpoint_address && memcmp(string, "new", 3) == 0) { if (watchpoint_address && memcmp(string, "new", 3) == 0) {
return VALUE_16(GB_read_memory(gb, *watchpoint_address)); ret = VALUE_16(GB_read_memory(gb, *watchpoint_address));
goto exit;
} }
} }
@ -568,12 +582,13 @@ value_t debugger_evaluate(GB_gameboy_t *gb, const char *string,
symbol_name[length] = 0; symbol_name[length] = 0;
const GB_symbol_t *symbol = GB_reversed_map_find_symbol(&gb->reversed_symbol_map, symbol_name); const GB_symbol_t *symbol = GB_reversed_map_find_symbol(&gb->reversed_symbol_map, symbol_name);
if (symbol) { if (symbol) {
return (value_t){true, symbol->bank, symbol->addr}; ret = (value_t){true, symbol->bank, symbol->addr};
goto exit;
} }
GB_log(gb, "Unknown register or symbol: %.*s\n", (unsigned int) length, string); GB_log(gb, "Unknown register or symbol: %.*s\n", (unsigned int) length, string);
*error = true; *error = true;
return ERROR; goto exit;
} }
char *end; char *end;
@ -587,9 +602,12 @@ value_t debugger_evaluate(GB_gameboy_t *gb, const char *string,
if (end != string + length) { if (end != string + length) {
GB_log(gb, "Failed to parse: %.*s\n", (unsigned int) length, string); GB_log(gb, "Failed to parse: %.*s\n", (unsigned int) length, string);
*error = true; *error = true;
return ERROR; goto exit;
} }
return VALUE_16(literal); ret = VALUE_16(literal);
exit:
gb->n_watchpoints = n_watchpoints;
return ret;
} }
struct debugger_command_s; struct debugger_command_s;
@ -1460,7 +1478,7 @@ static bool help(GB_gameboy_t *gb, char *arguments, char *modifiers, const debug
} }
return true; return true;
} }
for (const debugger_command_t *command = commands; command->command; command++) { for (command = commands; command->command; command++) {
if (command->help_string) { if (command->help_string) {
print_command_description(gb, command); print_command_description(gb, command);
} }