diff options
| author | Hang Xu <xuhang@eswincomputing.com> | 2023-03-12 04:01:05 +0000 |
|---|---|---|
| committer | Hang Xu <xuhang@eswincomputing.com> | 2023-03-12 04:01:05 +0000 |
| commit | 2370d78249f220e5584c4fe023abffbadcf785b0 (patch) | |
| tree | 54416c5647f187067a0237833b4e7ddc247b0d92 | |
| parent | 59e368e3089fd38ee7d88c3456e1922eaa9ca658 (diff) | |
| download | riscv-openocd-2370d78249f220e5584c4fe023abffbadcf785b0.zip riscv-openocd-2370d78249f220e5584c4fe023abffbadcf785b0.tar.gz riscv-openocd-2370d78249f220e5584c4fe023abffbadcf785b0.tar.bz2 | |
target/riscv: fix the bug of using S2 register in read_memory_progbuf
We should avoid using x16~x31 register in program buffer because there
are no such general purpose registers in RVE(Embedded) extension.
For targets that support rvE, when the parameter increment=0
and count>1 of the read_memory_progbuf function, openocd will cause
an error due to the use of the s2 register.
For example:
{Command} {riscv repeat_read} count address [size=4]
Change-Id: I8b74dcc15cd00a400f2f1354c577a82132394435
Signed-off-by: Hang Xu <xuhang@eswincomputing.com>
| -rw-r--r-- | src/target/riscv/riscv-013.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c index ee3ced6..4c78a47 100644 --- a/src/target/riscv/riscv-013.c +++ b/src/target/riscv/riscv-013.c @@ -3197,7 +3197,7 @@ static int read_memory_progbuf_inner(struct target *target, target_addr_t addres return result; if (increment == 0 && - register_write_direct(target, GDB_REGNO_S2, 0) != ERROR_OK) + register_write_direct(target, GDB_REGNO_A0, 0) != ERROR_OK) return ERROR_FAIL; uint32_t command = access_register_command(target, GDB_REGNO_S1, @@ -3299,7 +3299,7 @@ static int read_memory_progbuf_inner(struct target *target, target_addr_t addres /* See how far we got, clobbering dmi_data0. */ if (increment == 0) { uint64_t counter; - result = register_read_direct(target, &counter, GDB_REGNO_S2); + result = register_read_direct(target, &counter, GDB_REGNO_A0); next_index = counter; } else { uint64_t next_read_addr; @@ -3524,13 +3524,13 @@ static int read_memory_progbuf(struct target *target, target_addr_t address, /* s0 holds the next address to read from * s1 holds the next data value read - * s2 is a counter in case increment is 0 + * a0 is a counter in case increment is 0 */ if (riscv_save_register(target, GDB_REGNO_S0) != ERROR_OK) return ERROR_FAIL; if (riscv_save_register(target, GDB_REGNO_S1) != ERROR_OK) return ERROR_FAIL; - if (increment == 0 && riscv_save_register(target, GDB_REGNO_S2) != ERROR_OK) + if (increment == 0 && riscv_save_register(target, GDB_REGNO_A0) != ERROR_OK) return ERROR_FAIL; /* Write the program (load, increment) */ @@ -3560,7 +3560,7 @@ static int read_memory_progbuf(struct target *target, target_addr_t address, if (riscv_enable_virtual && has_sufficient_progbuf(target, 5) && get_field(mstatus, MSTATUS_MPRV)) riscv_program_csrrci(&program, GDB_REGNO_ZERO, CSR_DCSR_MPRVEN, GDB_REGNO_DCSR); if (increment == 0) - riscv_program_addi(&program, GDB_REGNO_S2, GDB_REGNO_S2, 1); + riscv_program_addi(&program, GDB_REGNO_A0, GDB_REGNO_A0, 1); else riscv_program_addi(&program, GDB_REGNO_S0, GDB_REGNO_S0, increment); |