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 #854 from en-sc/en-sc/fix-regacc-running 

target/riscv: fix register access on running target
This commit is contained in:
Tim Newsome 2023-06-02 08:25:07 -07:00 committed by GitHub
parent 58b6a5eabf 3a29542056
commit 5a9654d272
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1090,13 +1090,8 @@ static int prep_for_register_access(struct target *target,
LOG_TARGET_DEBUG(target, "Preparing mstatus to access %s", LOG_TARGET_DEBUG(target, "Preparing mstatus to access %s",
gdb_regno_name(regno)); gdb_regno_name(regno));
/* FIXME: On a running target, there is no way to make sure mstatus won't assert(target->state == TARGET_HALTED &&
* change between reading and writing it, so "The target must be halted to modify and then restore mstatus");
* if target->state != TARGET_HALTED an error should be returned here.
* However, this would not allow access to FPU registers on the running
* target.
* See https://github.com/riscv/riscv-openocd/pull/842#discussion_r1178500114
*/
if (riscv_get_register(target, orig_mstatus, GDB_REGNO_MSTATUS) != ERROR_OK) if (riscv_get_register(target, orig_mstatus, GDB_REGNO_MSTATUS) != ERROR_OK)
return ERROR_FAIL; return ERROR_FAIL;
@ -1487,6 +1482,9 @@ static int register_write_direct(struct target *target, enum gdb_regno number,
LOG_TARGET_DEBUG(target, "Writing 0x%" PRIx64 " to %s", value, LOG_TARGET_DEBUG(target, "Writing 0x%" PRIx64 " to %s", value,
gdb_regno_name(number)); gdb_regno_name(number));
if (target->state != TARGET_HALTED)
return register_write_abstract(target, number, value);
riscv_reg_t mstatus; riscv_reg_t mstatus;
if (prep_for_register_access(target, &mstatus, number) != ERROR_OK) if (prep_for_register_access(target, &mstatus, number) != ERROR_OK)
return ERROR_FAIL; return ERROR_FAIL;
@ -1512,6 +1510,9 @@ static int register_read_direct(struct target *target, riscv_reg_t *value,
{ {
LOG_TARGET_DEBUG(target, "Reading %s", gdb_regno_name(number)); LOG_TARGET_DEBUG(target, "Reading %s", gdb_regno_name(number));
if (target->state != TARGET_HALTED)
return register_read_abstract(target, value, number);
riscv_reg_t mstatus; riscv_reg_t mstatus;
if (prep_for_register_access(target, &mstatus, number) != ERROR_OK) if (prep_for_register_access(target, &mstatus, number) != ERROR_OK)