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

Tell the user about detected harts.

gitignore-build
Tim Newsome 2017-06-15 15:18:42 -07:00
parent 3abb347bd9
commit 851849a295
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1097,15 +1097,12 @@ static int examine(struct target *target)
r->xlen[i] = 64; r->xlen[i] = 64;
} }
LOG_DEBUG("hart %d has XLEN=%d", i, r->xlen[i]);
LOG_DEBUG("found program buffer at 0x%08lx", (long)(r->debug_buffer_addr[i]));
if (riscv_program_gah(&program64, r->debug_buffer_addr[i])) { if (riscv_program_gah(&program64, r->debug_buffer_addr[i])) {
LOG_ERROR("This implementation will not work with hart %d with debug_buffer_addr of 0x%lx\n", i, LOG_ERROR("This implementation will not work with hart %d with debug_buffer_addr of 0x%lx\n", i,
(long)r->debug_buffer_addr[i]); (long)r->debug_buffer_addr[i]);
abort(); abort();
} }
/* Check to see if we can use the data words as an extended /* Check to see if we can use the data words as an extended
* program buffer or not. */ * program buffer or not. */
if (r->debug_buffer_addr[i] + (4 * r->debug_buffer_size[i]) == riscv013_data_addr(target)) { if (r->debug_buffer_addr[i] + (4 * r->debug_buffer_size[i]) == riscv013_data_addr(target)) {
@ -1132,10 +1129,15 @@ static int examine(struct target *target)
riscv_resume_all_harts(target); riscv_resume_all_harts(target);
target_set_examined(target); target_set_examined(target);
// This print is used by some regression suites to know when // Some regression suites rely on seeing 'Examined RISC-V core' to know
// they can connect with gdb/telnet. // when they can connect with gdb/telnet.
// We will need to update those suites if we want to remove this line. // We will need to update those suites if we want to change that text.
LOG_INFO("Examined RISC-V core"); LOG_INFO("Examined RISC-V core; found %d harts",
riscv_count_harts(target));
for (int i = 0; i < riscv_count_harts(target); ++i) {
LOG_INFO(" hart %d: XLEN=%d, program buffer at 0x%" PRIx64, i,
r->xlen[i], r->debug_buffer_addr[i]);
}
return ERROR_OK; return ERROR_OK;
} }