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

Merge pull request #143 from riscv/fmv 

Fix build.
macbuild
Tim Newsome 2017-12-11 13:07:35 -08:00 committed by GitHub
parent e50ee46a6f 0a65a6527d
commit 20236ca817
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -994,7 +994,7 @@ static int register_write_direct(struct target *target, unsigned number,
if (supports_extension(target, 'D')) { if (supports_extension(target, 'D')) {
riscv_program_insert(&program, fmv_d_x(number - GDB_REGNO_FPR0, S0)); riscv_program_insert(&program, fmv_d_x(number - GDB_REGNO_FPR0, S0));
} else { } else {
riscv_program_insert(&program, fmv_s_x(number - GDB_REGNO_FPR0, S0)); riscv_program_insert(&program, fmv_w_x(number - GDB_REGNO_FPR0, S0));
} }
} else if (number >= GDB_REGNO_CSR0 && number <= GDB_REGNO_CSR4095) { } else if (number >= GDB_REGNO_CSR0 && number <= GDB_REGNO_CSR4095) {
riscv_program_csrw(&program, S0, number); riscv_program_csrw(&program, S0, number);
@ -1054,7 +1054,7 @@ static int register_read_direct(struct target *target, uint64_t *value, uint32_t
} else if (supports_extension(target, 'D')) { } else if (supports_extension(target, 'D')) {
riscv_program_insert(&program, fmv_x_d(S0, number - GDB_REGNO_FPR0)); riscv_program_insert(&program, fmv_x_d(S0, number - GDB_REGNO_FPR0));
} else { } else {
riscv_program_insert(&program, fmv_x_s(S0, number - GDB_REGNO_FPR0)); riscv_program_insert(&program, fmv_x_w(S0, number - GDB_REGNO_FPR0));
} }
} else if (number >= GDB_REGNO_CSR0 && number <= GDB_REGNO_CSR4095) { } else if (number >= GDB_REGNO_CSR0 && number <= GDB_REGNO_CSR4095) {
riscv_program_csrr(&program, S0, number); riscv_program_csrr(&program, S0, number);