interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #840 from aap-sc/aap-sc/resume_on_bp 

fix bp handling during resume
This commit is contained in:
Tim Newsome 2023-04-28 09:13:58 -07:00 committed by GitHub
parent 70380dda80 152ef1a936
commit fc52bfefc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/target/riscv/riscv.c
View File

@ -1733,23 +1733,23 @@ static int resume_prep(struct target *target, int current,
target_addr_t address, int handle_breakpoints, int debug_execution) target_addr_t address, int handle_breakpoints, int debug_execution)
{ {
RISCV_INFO(r); RISCV_INFO(r);
LOG_TARGET_DEBUG(target, "target->state=%d", target->state);
LOG_TARGET_DEBUG(target, "target->state=%d, current=%s, address=0x%"
TARGET_PRIxADDR ", handle_breakpoints=%s, debug_exec=%s",
target->state,
current ? "true" : "false",
address,
handle_breakpoints ? "true" : "false",
debug_execution ? "true" : "false");
if (!current && riscv_set_register(target, GDB_REGNO_PC, address) != ERROR_OK) if (!current && riscv_set_register(target, GDB_REGNO_PC, address) != ERROR_OK)
return ERROR_FAIL; return ERROR_FAIL;
if (target->debug_reason == DBG_REASON_WATCHPOINT) { if (handle_breakpoints) {
/* To be able to run off a trigger, disable all the triggers, step, and /* To be able to run off a trigger, we perform a step operation and then
* then resume as usual. */ * resume. If handle_breakpoints is true then step temporarily disables
riscv_reg_t trigger_state[RISCV_MAX_HWBPS] = {0}; * pending breakpoints so we can safely perform the step. */
if (old_or_new_riscv_step(target, current, address, handle_breakpoints) != ERROR_OK)
if (disable_triggers(target, trigger_state) != ERROR_OK)
return ERROR_FAIL;
if (old_or_new_riscv_step(target, true, 0, false) != ERROR_OK)
return ERROR_FAIL;
if (enable_triggers(target, trigger_state) != ERROR_OK)
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1857,9 +1857,16 @@ static int riscv_resume(
return result; return result;
} }
static int riscv_target_resume(struct target *target, int current, target_addr_t address, static int riscv_target_resume(struct target *target, int current,
int handle_breakpoints, int debug_execution) target_addr_t address, int handle_breakpoints, int debug_execution)
{ {
LOG_TARGET_DEBUG(target, "target->state=%d, current=%s, address=0x%"
TARGET_PRIxADDR ", handle_breakpoints=%s, debug_exec=%s",
target->state,
current ? "true" : "false",
address,
handle_breakpoints ? "true" : "false",
debug_execution ? "true" : "false");
return riscv_resume(target, current, address, handle_breakpoints, return riscv_resume(target, current, address, handle_breakpoints,
debug_execution, false); debug_execution, false);
} }