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

stw

This commit is contained in:
Palmer Dabbelt 2017-04-14 19:55:32 -07:00
parent 763e5cb44c
commit 4af702c9c4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,6 +111,9 @@ riscv_addr_t riscv_program_alloc_data(struct riscv_program *p, size_t bytes)
} }
LOG_DEBUG("allocated %d bytes at 0x%08lx", bytes, addr); LOG_DEBUG("allocated %d bytes at 0x%08lx", bytes, addr);
p->data_count =
+ riscv_debug_buffer_size(p->target)
- (addr - riscv_debug_buffer_addr(p->target)) / sizeof(p->debug_buffer[0]);
return addr; return addr;
} }

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

@ -1234,8 +1234,8 @@ static int read_memory(struct target *target, uint32_t address,
struct riscv_program program; struct riscv_program program;
riscv_program_init(&program, target); riscv_program_init(&program, target);
riscv_addr_t r_addr = riscv_program_alloc_x(&program);
riscv_addr_t r_data = riscv_program_alloc_w(&program); riscv_addr_t r_data = riscv_program_alloc_w(&program);
riscv_addr_t r_addr = riscv_program_alloc_x(&program);
riscv_program_lx(&program, GDB_REGNO_S0, r_addr); riscv_program_lx(&program, GDB_REGNO_S0, r_addr);
switch (size) { switch (size) {
case 1: case 1:
@ -1338,8 +1338,8 @@ static int write_memory(struct target *target, uint32_t address,
struct riscv_program program; struct riscv_program program;
riscv_program_init(&program, target); riscv_program_init(&program, target);
riscv_addr_t r_addr = riscv_program_alloc_x(&program);
riscv_addr_t r_data = riscv_program_alloc_w(&program); riscv_addr_t r_data = riscv_program_alloc_w(&program);
riscv_addr_t r_addr = riscv_program_alloc_x(&program);
riscv_program_lx(&program, GDB_REGNO_S0, r_addr); riscv_program_lx(&program, GDB_REGNO_S0, r_addr);
riscv_program_lw(&program, GDB_REGNO_S1, r_data); riscv_program_lw(&program, GDB_REGNO_S1, r_data);
@ -1707,8 +1707,6 @@ static void riscv013_step_or_resume_current_hart(struct target *target, bool ste
continue; continue;
if (step && get_field(dmstatus, DMI_DMSTATUS_ALLHALTED) == 0) if (step && get_field(dmstatus, DMI_DMSTATUS_ALLHALTED) == 0)
continue; continue;
if (!step && get_field(dmstatus, DMI_DMSTATUS_ALLRUNNING) == 0)
continue;
dmcontrol = set_field(dmcontrol, DMI_DMCONTROL_RESUMEREQ, 0); dmcontrol = set_field(dmcontrol, DMI_DMCONTROL_RESUMEREQ, 0);
dmi_write(target, DMI_DMCONTROL, dmcontrol); dmi_write(target, DMI_DMCONTROL, dmcontrol);