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 #660 from riscv/resume_order 

Revive `riscv resume_order`
This commit is contained in:
Tim Newsome 2021-11-03 11:16:55 -07:00 committed by GitHub
parent d97da0eb74 b1f244b823
commit bda1027191
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1465,6 +1465,32 @@ static int resume_finish(struct target *target)
return target_call_event_callbacks(target, TARGET_EVENT_RESUMED); return target_call_event_callbacks(target, TARGET_EVENT_RESUMED);
} }
/* Return a newly allocated target list, that contains the same targets as in
* tlist bit in the opposite order. */
static struct target_list *tlist_reverse(struct target_list *tlist)
{
struct target_list *previous = NULL;
struct target_list *reversed = NULL;
for (struct target_list *node = tlist; node; node = node->next) {
reversed = calloc(1, sizeof(struct target_list));
reversed->target = node->target;
reversed->next = previous;
previous = reversed;
}
return reversed;
}
/* Free a target list, but not the targets that are referenced. */
static void tlist_free(struct target_list *tlist)
{
struct target_list *node = tlist;
while (node) {
struct target_list *previous = node;
node = node->next;
free(previous);
}
}
/** /**
* @par single_hart When true, only resume a single hart even if SMP is * @par single_hart When true, only resume a single hart even if SMP is
* configured. This is used to run algorithms on just one hart. * configured. This is used to run algorithms on just one hart.
@ -1480,14 +1506,21 @@ 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;
if (target->smp && !single_hart) { if (target->smp && !single_hart) {
for (struct target_list *tlist = target->head; tlist; tlist = tlist->next) { struct target_list *ordered_tlist;
if (resume_order == RO_REVERSED)
ordered_tlist = tlist_reverse(target->head);
else
ordered_tlist = target->head;
for (struct target_list *tlist = ordered_tlist; tlist; tlist = tlist->next) {
struct target *t = tlist->target; struct target *t = tlist->target;
if (resume_prep(t, current, address, handle_breakpoints, if (resume_prep(t, current, address, handle_breakpoints,
debug_execution) != ERROR_OK) debug_execution) != ERROR_OK)
result = ERROR_FAIL; result = ERROR_FAIL;
} }
for (struct target_list *tlist = target->head; tlist; tlist = tlist->next) { for (struct target_list *tlist = ordered_tlist; tlist; tlist = tlist->next) {
struct target *t = tlist->target; struct target *t = tlist->target;
riscv_info_t *i = riscv_info(t); riscv_info_t *i = riscv_info(t);
if (i->prepped) { if (i->prepped) {
@ -1497,12 +1530,15 @@ int riscv_resume(
} }
} }
for (struct target_list *tlist = target->head; tlist; tlist = tlist->next) { for (struct target_list *tlist = ordered_tlist; tlist; tlist = tlist->next) {
struct target *t = tlist->target; struct target *t = tlist->target;
if (resume_finish(t) != ERROR_OK) if (resume_finish(t) != ERROR_OK)
return ERROR_FAIL; result = ERROR_FAIL;
} }
if (resume_order == RO_REVERSED)
tlist_free(ordered_tlist);
} else { } else {
if (resume_prep(target, current, address, handle_breakpoints, if (resume_prep(target, current, address, handle_breakpoints,
debug_execution) != ERROR_OK) debug_execution) != ERROR_OK)