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

target/riscv: Share single-target and SMP resume code. 

Change-Id: I416d8cc4c8c5ca0337c1f7e392b6b4fa3d75757f
Signed-off-by: Tim Newsome <tim@sifive.com>
This commit is contained in:
Tim Newsome 2022-10-13 10:50:39 -07:00
parent 5832b983f5
commit d3bffe3d86
1 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1604,43 +1604,46 @@ int riscv_resume(
{ {
LOG_DEBUG("handle_breakpoints=%d", handle_breakpoints); LOG_DEBUG("handle_breakpoints=%d", handle_breakpoints);
int result = ERROR_OK; int result = ERROR_OK;
struct list_head *targets;
LIST_HEAD(single_target_list);
struct target_list single_target_entry = {
.lh = {NULL, NULL},
.target = target
};
if (target->smp && !single_hart) { if (target->smp && !single_hart) {
struct target_list *tlist; targets = target->smp_targets;
foreach_smp_target_direction(resume_order == RO_NORMAL, } else {
tlist, target->smp_targets) { /* Make a list that just contains a single target, so we can
struct target *t = tlist->target; * share code below. */
if (resume_prep(t, current, address, handle_breakpoints, list_add(&single_target_entry.lh, &single_target_list);
targets = &single_target_list;
}
struct target_list *tlist;
foreach_smp_target_direction(resume_order == RO_NORMAL, tlist, targets) {
struct target *t = tlist->target;
if (resume_prep(t, current, address, handle_breakpoints,
debug_execution) != ERROR_OK)
result = ERROR_FAIL;
}
foreach_smp_target_direction(resume_order == RO_NORMAL, tlist, targets) {
struct target *t = tlist->target;
riscv_info_t *i = riscv_info(t);
if (i->prepped) {
if (resume_go(t, current, address, handle_breakpoints,
debug_execution) != ERROR_OK) debug_execution) != ERROR_OK)
result = ERROR_FAIL; result = ERROR_FAIL;
} }
}
foreach_smp_target_direction(resume_order == RO_NORMAL, foreach_smp_target_direction(resume_order == RO_NORMAL, tlist, targets) {
tlist, target->smp_targets) { struct target *t = tlist->target;
struct target *t = tlist->target; if (resume_finish(t, debug_execution) != ERROR_OK)
riscv_info_t *i = riscv_info(t);
if (i->prepped) {
if (resume_go(t, current, address, handle_breakpoints,
debug_execution) != ERROR_OK)
result = ERROR_FAIL;
}
}
foreach_smp_target_direction(resume_order == RO_NORMAL,
tlist, target->smp_targets) {
struct target *t = tlist->target;
if (resume_finish(t, debug_execution) != ERROR_OK)
result = ERROR_FAIL;
}
} else {
if (resume_prep(target, current, address, handle_breakpoints,
debug_execution) != ERROR_OK)
result = ERROR_FAIL; result = ERROR_FAIL;
if (resume_go(target, current, address, handle_breakpoints,
debug_execution) != ERROR_OK)
result = ERROR_FAIL;
if (resume_finish(target, debug_execution) != ERROR_OK)
return ERROR_FAIL;
} }
return result; return result;