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

Keep calling the old poll on v0.11 targets 

This is another thing that should be fixed correctly.  Essentially this
just uses the old codepath, which works for v0.11.
race
Palmer Dabbelt 2017-04-26 15:16:39 -07:00
parent 9d4df3420c
commit 17d04aded3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,6 +341,15 @@ static int oldriscv_poll(struct target *target)
return tt->poll(target);
}
static int old_or_new_riscv_poll(struct target *target)
{
RISCV_INFO(r);
if (r->is_halted == NULL)
return oldriscv_poll(target);
else
return riscv_openocd_poll(target);
}
static int riscv_resume(struct target *target, int current, uint32_t address,
int handle_breakpoints, int debug_execution)
{
@ -506,11 +515,11 @@ static int riscv_run_algorithm(struct target *target, int num_mem_params,
LOG_ERROR(" now = 0x%08x", (uint32_t) now);
LOG_ERROR(" start = 0x%08x", (uint32_t) start);
riscv_halt(target);
riscv_openocd_poll(target);
old_or_new_riscv_poll(target);
return ERROR_TARGET_TIMEOUT;
}
int result = riscv_openocd_poll(target);
int result = old_or_new_riscv_poll(target);
if (result != ERROR_OK) {
return result;
}