Skip to content

Commit 851849a

Browse files
committed
Tell the user about detected harts.
1 parent 3abb347 commit 851849a

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/target/riscv/riscv-013.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,15 +1097,12 @@ static int examine(struct target *target)
10971097
r->xlen[i] = 64;
10981098
}
10991099

1100-
LOG_DEBUG("hart %d has XLEN=%d", i, r->xlen[i]);
1101-
LOG_DEBUG("found program buffer at 0x%08lx", (long)(r->debug_buffer_addr[i]));
1102-
11031100
if (riscv_program_gah(&program64, r->debug_buffer_addr[i])) {
11041101
LOG_ERROR("This implementation will not work with hart %d with debug_buffer_addr of 0x%lx\n", i,
11051102
(long)r->debug_buffer_addr[i]);
11061103
abort();
11071104
}
1108-
1105+
11091106
/* Check to see if we can use the data words as an extended
11101107
* program buffer or not. */
11111108
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)
11321129
riscv_resume_all_harts(target);
11331130
target_set_examined(target);
11341131

1135-
// This print is used by some regression suites to know when
1136-
// they can connect with gdb/telnet.
1137-
// We will need to update those suites if we want to remove this line.
1138-
LOG_INFO("Examined RISC-V core");
1132+
// Some regression suites rely on seeing 'Examined RISC-V core' to know
1133+
// when they can connect with gdb/telnet.
1134+
// We will need to update those suites if we want to change that text.
1135+
LOG_INFO("Examined RISC-V core; found %d harts",
1136+
riscv_count_harts(target));
1137+
for (int i = 0; i < riscv_count_harts(target); ++i) {
1138+
LOG_INFO(" hart %d: XLEN=%d, program buffer at 0x%" PRIx64, i,
1139+
r->xlen[i], r->debug_buffer_addr[i]);
1140+
}
11391141
return ERROR_OK;
11401142
}
11411143

0 commit comments

Comments
 (0)