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 #1055 from aap-sc/aap-sc/bp_unitialized 

target/riscv: use breakpoint_hw_set/watchpoint_set to properly initialize bp/wp descriptor
This commit is contained in:
Evgeniy Naydanov 2024-04-27 16:42:29 +03:00 committed by GitHub
parent e51f8695ed 88f7650a6d
commit 9563cd67e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1415,6 +1415,7 @@ static int riscv_add_breakpoint(struct target *target, struct breakpoint *breakp
TARGET_PRIxADDR, breakpoint->length, breakpoint->address);
return ERROR_FAIL;
}
breakpoint->is_set = true;
} else if (breakpoint->type == BKPT_HARD) {
struct trigger trigger;
@ -1422,12 +1423,13 @@ static int riscv_add_breakpoint(struct target *target, struct breakpoint *breakp
int const result = add_trigger(target, &trigger);
if (result != ERROR_OK)
return result;
int trigger_idx = find_first_trigger_by_id(target, breakpoint->unique_id);
breakpoint_hw_set(breakpoint, trigger_idx);
} else {
LOG_TARGET_INFO(target, "OpenOCD only supports hardware and software breakpoints.");
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
}
breakpoint->is_set = true;
return ERROR_OK;
}
@ -1521,7 +1523,9 @@ int riscv_add_watchpoint(struct target *target, struct watchpoint *watchpoint)
int result = add_trigger(target, &trigger);
if (result != ERROR_OK)
return result;
watchpoint->is_set = true;
int trigger_idx = find_first_trigger_by_id(target, watchpoint->unique_id);
watchpoint_set(watchpoint, trigger_idx);
return ERROR_OK;
}