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

Merge pull request #179 from riscv/multicore_hart_selection 

Select current hart before reading memory.
rbb_cleanup
Tim Newsome 2018-01-05 14:07:38 -08:00 committed by GitHub
parent 11e51af3b1 6f3913cedc
commit 0e3869cbf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -720,9 +720,19 @@ static int old_or_new_riscv_resume(
return riscv_openocd_resume(target, current, address, handle_breakpoints, debug_execution); return riscv_openocd_resume(target, current, address, handle_breakpoints, debug_execution);
} }
static void riscv_select_current_hart(struct target *target)
{
RISCV_INFO(r);
if (r->rtos_hartid != -1 && riscv_rtos_enabled(target))
riscv_set_current_hartid(target, r->rtos_hartid);
else
riscv_set_current_hartid(target, target->coreid);
}
static int riscv_read_memory(struct target *target, target_addr_t address, static int riscv_read_memory(struct target *target, target_addr_t address,
uint32_t size, uint32_t count, uint8_t *buffer) uint32_t size, uint32_t count, uint8_t *buffer)
{ {
riscv_select_current_hart(target);
struct target_type *tt = get_target_type(target); struct target_type *tt = get_target_type(target);
return tt->read_memory(target, address, size, count, buffer); return tt->read_memory(target, address, size, count, buffer);
} }
@ -730,6 +740,7 @@ static int riscv_read_memory(struct target *target, target_addr_t address,
static int riscv_write_memory(struct target *target, target_addr_t address, static int riscv_write_memory(struct target *target, target_addr_t address,
uint32_t size, uint32_t count, const uint8_t *buffer) uint32_t size, uint32_t count, const uint8_t *buffer)
{ {
riscv_select_current_hart(target);
struct target_type *tt = get_target_type(target); struct target_type *tt = get_target_type(target);
return tt->write_memory(target, address, size, count, buffer); return tt->write_memory(target, address, size, count, buffer);
} }
@ -747,10 +758,7 @@ static int riscv_get_gdb_reg_list(struct target *target,
return ERROR_FAIL; return ERROR_FAIL;
} }
if (r->rtos_hartid != -1 && riscv_rtos_enabled(target)) riscv_select_current_hart(target);
riscv_set_current_hartid(target, r->rtos_hartid);
else
riscv_set_current_hartid(target, target->coreid);
switch (reg_class) { switch (reg_class) {
case REG_CLASS_GENERAL: case REG_CLASS_GENERAL: