diff options
| author | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2024-04-19 22:59:58 +0300 |
|---|---|---|
| committer | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2024-04-20 00:11:51 +0300 |
| commit | 967510cb1ddebd379ae01b941038285077c5113f (patch) | |
| tree | 78dc72109a6734bb9d93ad26519136299f43bbb6 | |
| parent | 3991492cc101f4289be06ec7dc23c6ad7748a74a (diff) | |
| download | riscv-openocd-967510cb1ddebd379ae01b941038285077c5113f.zip riscv-openocd-967510cb1ddebd379ae01b941038285077c5113f.tar.gz riscv-openocd-967510cb1ddebd379ae01b941038285077c5113f.tar.bz2 | |
target/riscv/riscv-011.c: fix access to non-existent register
`reg` is a number in register cache, as evident by the following call to
`reg_cache_set()`. `CSR_DCSR` is `GDB_REGNO_DCSR - 65`. This results in
setting cache value for another register, which does not exist, and
causes a segfault if all non-existent registers are not allocated a
value (`reg->value == NULL`).
Change-Id: Iab68a4bb55ce6d4730804e9709e40ab2af8a07c6
Signed-off-by: Evgeniy Naydanov <evgeniy.naydanov@syntacore.com>
| -rw-r--r-- | src/target/riscv/riscv-011.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/target/riscv/riscv-011.c b/src/target/riscv/riscv-011.c index 88ae14d..4b8740b 100644 --- a/src/target/riscv/riscv-011.c +++ b/src/target/riscv/riscv-011.c @@ -1771,10 +1771,10 @@ static riscv_error_t handle_halt_routine(struct target *target) reg = S0; break; case 31: - reg = CSR_DPC; + reg = GDB_REGNO_DPC; break; case 32: - reg = CSR_DCSR; + reg = GDB_REGNO_DCSR; break; default: assert(0); @@ -1808,8 +1808,8 @@ static riscv_error_t handle_halt_routine(struct target *target) } /* TODO: get rid of those 2 variables and talk to the cache directly. */ - info->dpc = reg_cache_get(target, CSR_DPC); - info->dcsr = reg_cache_get(target, CSR_DCSR); + info->dpc = reg_cache_get(target, GDB_REGNO_DPC); + info->dcsr = reg_cache_get(target, GDB_REGNO_DCSR); cache_invalidate(target); |