zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP make riscv work with -rtos hwthread. 

Change-Id: I37bb16291fa87a83f21e5fd8bad53492a4d69425
log_output
Tim Newsome 2019-01-03 15:06:35 -08:00
parent 0736929512
commit a9d436e77f
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -856,8 +856,28 @@ static int old_or_new_riscv_resume(
int handle_breakpoints, int handle_breakpoints,
int debug_execution int debug_execution
){ ){
RISCV_INFO(r);
LOG_DEBUG("handle_breakpoints=%d", handle_breakpoints); LOG_DEBUG("handle_breakpoints=%d", handle_breakpoints);
if (target->smp) {
struct target_list *targets = target->head;
int result = ERROR_OK;
while (targets) {
struct target *t = targets->target;
riscv_info_t *r = riscv_info(t);
if (r->is_halted == NULL) {
if (oldriscv_resume(t, current, address, handle_breakpoints,
debug_execution) != ERROR_OK)
result = ERROR_FAIL;
} else {
if (riscv_openocd_resume(t, current, address,
handle_breakpoints, debug_execution) != ERROR_OK)
result = ERROR_FAIL;
}
targets = targets->next;
}
return result;
}
RISCV_INFO(r);
if (r->is_halted == NULL) if (r->is_halted == NULL)
return oldriscv_resume(target, current, address, handle_breakpoints, debug_execution); return oldriscv_resume(target, current, address, handle_breakpoints, debug_execution);
else else
@ -1938,9 +1958,10 @@ int riscv_xlen_of_hart(const struct target *target, int hartid)
return r->xlen[hartid]; return r->xlen[hartid];
} }
extern struct rtos_type riscv_rtos;
bool riscv_rtos_enabled(const struct target *target) bool riscv_rtos_enabled(const struct target *target)
{ {
return target->rtos != NULL; return target->rtos && target->rtos->type == &riscv_rtos;
} }
int riscv_set_current_hartid(struct target *target, int hartid) int riscv_set_current_hartid(struct target *target, int hartid)