interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add support for F extension.

This commit is contained in:
Tim Newsome 2017-09-14 16:21:49 -07:00
parent 1cd8ecfdcd
commit ce20be3d78
4 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/target/riscv/program.c
View File

@ -3,6 +3,7 @@
#endif #endif
#include "target/target.h" #include "target/target.h"
#include "target/register.h"
#include "riscv.h" #include "riscv.h"
#include "program.h" #include "program.h"
#include "helper/log.h" #include "helper/log.h"
@ -369,7 +370,7 @@ int riscv_program_addi(struct riscv_program *p, enum gdb_regno d, enum gdb_regno
return riscv_program_insert(p, addi(d, s, u)); return riscv_program_insert(p, addi(d, s, u));
} }
int riscv_program_fsd(struct riscv_program *p, enum gdb_regno d, riscv_addr_t addr) int riscv_program_fsx(struct riscv_program *p, enum gdb_regno d, riscv_addr_t addr)
{ {
assert(d >= GDB_REGNO_FPR0); assert(d >= GDB_REGNO_FPR0);
assert(d <= GDB_REGNO_FPR31); assert(d <= GDB_REGNO_FPR31);
@ -378,21 +379,43 @@ int riscv_program_fsd(struct riscv_program *p, enum gdb_regno d, riscv_addr_t ad
: riscv_program_gettemp(p); : riscv_program_gettemp(p);
if (riscv_program_lah(p, t, addr) != ERROR_OK) if (riscv_program_lah(p, t, addr) != ERROR_OK)
return ERROR_FAIL; return ERROR_FAIL;
if (riscv_program_insert(p, fsd(d - GDB_REGNO_FPR0, t, riscv_program_gal(p, addr))) != ERROR_OK) uint32_t instruction;
switch (p->target->reg_cache->reg_list[GDB_REGNO_FPR0].size) {
case 64:
instruction = fsd(d - GDB_REGNO_FPR0, t, riscv_program_gal(p, addr));
break;
case 32:
instruction = fsw(d - GDB_REGNO_FPR0, t, riscv_program_gal(p, addr));
break;
default:
return ERROR_FAIL;
}
if (riscv_program_insert(p, instruction) != ERROR_OK)
return ERROR_FAIL; return ERROR_FAIL;
riscv_program_puttemp(p, t); riscv_program_puttemp(p, t);
p->writes_memory = true; p->writes_memory = true;
return ERROR_OK; return ERROR_OK;
} }
int riscv_program_fld(struct riscv_program *p, enum gdb_regno d, riscv_addr_t addr) int riscv_program_flx(struct riscv_program *p, enum gdb_regno d, riscv_addr_t addr)
{ {
assert(d >= GDB_REGNO_FPR0); assert(d >= GDB_REGNO_FPR0);
assert(d <= GDB_REGNO_FPR31); assert(d <= GDB_REGNO_FPR31);
enum gdb_regno t = riscv_program_gah(p, addr) == 0 ? GDB_REGNO_X0 : d; enum gdb_regno t = riscv_program_gah(p, addr) == 0 ? GDB_REGNO_X0 : d;
if (riscv_program_lah(p, t, addr) != ERROR_OK) if (riscv_program_lah(p, t, addr) != ERROR_OK)
return ERROR_FAIL; return ERROR_FAIL;
if (riscv_program_insert(p, fld(d - GDB_REGNO_FPR0, t, riscv_program_gal(p, addr))) != ERROR_OK) uint32_t instruction;
switch (p->target->reg_cache->reg_list[GDB_REGNO_FPR0].size) {
case 64:
instruction = fld(d - GDB_REGNO_FPR0, t, riscv_program_gal(p, addr));
break;
case 32:
instruction = flw(d - GDB_REGNO_FPR0, t, riscv_program_gal(p, addr));
break;
default:
return ERROR_FAIL;
}
if (riscv_program_insert(p, instruction) != ERROR_OK)
return ERROR_FAIL; return ERROR_FAIL;
return ERROR_OK; return ERROR_OK;
} }

4
src/target/riscv/program.h
View File

@ -114,8 +114,8 @@ int riscv_program_ebreak(struct riscv_program *p);
int riscv_program_lui(struct riscv_program *p, enum gdb_regno d, int32_t u); int riscv_program_lui(struct riscv_program *p, enum gdb_regno d, int32_t u);
int riscv_program_addi(struct riscv_program *p, enum gdb_regno d, enum gdb_regno s, int16_t i); int riscv_program_addi(struct riscv_program *p, enum gdb_regno d, enum gdb_regno s, int16_t i);
int riscv_program_fsd(struct riscv_program *p, enum gdb_regno s, riscv_addr_t addr); int riscv_program_fsx(struct riscv_program *p, enum gdb_regno s, riscv_addr_t addr);
int riscv_program_fld(struct riscv_program *p, enum gdb_regno d, riscv_addr_t addr); int riscv_program_flx(struct riscv_program *p, enum gdb_regno d, riscv_addr_t addr);
/* Assembler macros. */ /* Assembler macros. */
int riscv_program_li(struct riscv_program *p, enum gdb_regno d, riscv_reg_t c); int riscv_program_li(struct riscv_program *p, enum gdb_regno d, riscv_reg_t c);

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

@ -780,7 +780,7 @@ static int register_write_direct(struct target *target, unsigned number,
if (number <= GDB_REGNO_XPR31) { if (number <= GDB_REGNO_XPR31) {
riscv_program_lx(&program, number, input); riscv_program_lx(&program, number, input);
} else if (number >= GDB_REGNO_FPR0 && number <= GDB_REGNO_FPR31) { } else if (number >= GDB_REGNO_FPR0 && number <= GDB_REGNO_FPR31) {
riscv_program_fld(&program, number, input); riscv_program_flx(&program, number, input);
} else if (number >= GDB_REGNO_CSR0 && number <= GDB_REGNO_CSR4095) { } else if (number >= GDB_REGNO_CSR0 && number <= GDB_REGNO_CSR4095) {
enum gdb_regno temp = riscv_program_gettemp(&program); enum gdb_regno temp = riscv_program_gettemp(&program);
riscv_program_lx(&program, temp, input); riscv_program_lx(&program, temp, input);
@ -816,7 +816,7 @@ static int register_read_direct(struct target *target, uint64_t *value, uint32_t
if (number <= GDB_REGNO_XPR31) { if (number <= GDB_REGNO_XPR31) {
riscv_program_sx(&program, number, output); riscv_program_sx(&program, number, output);
} else if (number >= GDB_REGNO_FPR0 && number <= GDB_REGNO_FPR31) { } else if (number >= GDB_REGNO_FPR0 && number <= GDB_REGNO_FPR31) {
riscv_program_fsd(&program, number, output); riscv_program_fsx(&program, number, output);
} else if (number >= GDB_REGNO_CSR0 && number <= GDB_REGNO_CSR4095) { } else if (number >= GDB_REGNO_CSR0 && number <= GDB_REGNO_CSR4095) {
LOG_DEBUG("reading CSR index=0x%03x", number - GDB_REGNO_CSR0); LOG_DEBUG("reading CSR index=0x%03x", number - GDB_REGNO_CSR0);
enum gdb_regno temp = riscv_program_gettemp(&program); enum gdb_regno temp = riscv_program_gettemp(&program);

2
src/target/riscv/riscv.c
View File

@ -1715,6 +1715,8 @@ const char *gdb_regno_name(enum gdb_regno regno)
sprintf(buf, "x%d", regno - GDB_REGNO_XPR0); sprintf(buf, "x%d", regno - GDB_REGNO_XPR0);
} else if (regno >= GDB_REGNO_CSR0 && regno <= GDB_REGNO_CSR4095) { } else if (regno >= GDB_REGNO_CSR0 && regno <= GDB_REGNO_CSR4095) {
sprintf(buf, "csr%d", regno - GDB_REGNO_CSR0); sprintf(buf, "csr%d", regno - GDB_REGNO_CSR0);
} else if (regno >= GDB_REGNO_FPR0 && regno <= GDB_REGNO_FPR31) {
sprintf(buf, "f%d", regno - GDB_REGNO_FPR0);
} else { } else {
sprintf(buf, "gdb_regno_%d", regno); sprintf(buf, "gdb_regno_%d", regno);
} }