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 #221 from riscv/reg_running 

Error instead of asserting on reg access failure
This commit is contained in:
Tim Newsome 2018-03-07 12:22:33 -08:00 committed by GitHub
parent c54da11679 509e0e4715
commit fd9de02fac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/target/riscv/riscv-013.c
View File

@ -1045,8 +1045,8 @@ static int register_write_direct(struct target *target, unsigned number,
int result = register_write_abstract(target, number, value, int result = register_write_abstract(target, number, value,
register_size(target, number)); register_size(target, number));
if (result == ERROR_OK || if (result == ERROR_OK || info->progbufsize + r->impebreak < 2 ||
info->progbufsize + r->impebreak < 2) !riscv_is_halted(target))
return result; return result;
struct riscv_program program; struct riscv_program program;
@ -1110,8 +1110,8 @@ static int register_read_direct(struct target *target, uint64_t *value, uint32_t
int result = register_read_abstract(target, value, number, int result = register_read_abstract(target, value, number,
register_size(target, number)); register_size(target, number));
if (result != ERROR_OK && if (result != ERROR_OK && info->progbufsize + r->impebreak >= 2 &&
info->progbufsize + r->impebreak >= 2) { riscv_is_halted(target)) {
assert(number != GDB_REGNO_S0); assert(number != GDB_REGNO_S0);
struct riscv_program program; struct riscv_program program;