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

Merge pull request #951 from en-sc/en-sc/scan-dump-reg 

target/riscv: dump_field() shouldn't always decode
This commit is contained in:
Tim Newsome 2023-11-16 09:20:33 -08:00 committed by GitHub
parent 6de536bbb8 00320fd198
commit 46e8f7a566
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/target/riscv/batch.c
View File

@ -215,13 +215,13 @@ static void dump_field(int idle, const struct scan_field *field)
unsigned int in_address = in >> DTM_DMI_ADDRESS_OFFSET; unsigned int in_address = in >> DTM_DMI_ADDRESS_OFFSET;
log_printf_lf(LOG_LVL_DEBUG, log_printf_lf(LOG_LVL_DEBUG,
__FILE__, __LINE__, __PRETTY_FUNCTION__, __FILE__, __LINE__, __func__,
"%db %s %08x @%02x -> %s %08x @%02x; %di", "%db %s %08x @%02x -> %s %08x @%02x; %di",
field->num_bits, op_string[out_op], out_data, out_address, field->num_bits, op_string[out_op], out_data, out_address,
status_string[in_op], in_data, in_address, idle); status_string[in_op], in_data, in_address, idle);
} else { } else {
log_printf_lf(LOG_LVL_DEBUG, log_printf_lf(LOG_LVL_DEBUG,
__FILE__, __LINE__, __PRETTY_FUNCTION__, "%db %s %08x @%02x -> ?; %di", __FILE__, __LINE__, __func__, "%db %s %08x @%02x -> ?; %di",
field->num_bits, op_string[out_op], out_data, out_address, idle); field->num_bits, op_string[out_op], out_data, out_address, idle);
} }
} }

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

@ -371,7 +371,7 @@ static unsigned int decode_dmi(struct target *target, char *text, unsigned int a
return decode_dm(text, address - dm->base, data); return decode_dm(text, address - dm->base, data);
} }
static void dump_field(struct target *target, int idle, const struct scan_field *field) static void dump_field(struct target *target, int idle, const struct scan_field *field, bool discard_in)
{ {
static const char * const op_string[] = {"-", "r", "w", "?"}; static const char * const op_string[] = {"-", "r", "w", "?"};
static const char * const status_string[] = {"+", "?", "F", "b"}; static const char * const status_string[] = {"+", "?", "F", "b"};
@ -389,19 +389,22 @@ static void dump_field(struct target *target, int idle, const struct scan_field
unsigned int in_data = get_field(in, DTM_DMI_DATA); unsigned int in_data = get_field(in, DTM_DMI_DATA);
unsigned int in_address = in >> DTM_DMI_ADDRESS_OFFSET; unsigned int in_address = in >> DTM_DMI_ADDRESS_OFFSET;
log_printf_lf(LOG_LVL_DEBUG, log_printf_lf(LOG_LVL_DEBUG, __FILE__, __LINE__, __func__,
__FILE__, __LINE__, "scan",
"%db %s %08x @%02x -> %s %08x @%02x; %di", "%db %s %08x @%02x -> %s %08x @%02x; %di",
field->num_bits, op_string[out_op], out_data, out_address, field->num_bits, op_string[out_op], out_data, out_address,
status_string[in_op], in_data, in_address, idle); status_string[in_op], in_data, in_address, idle);
char out_text[decode_dmi(target, NULL, out_address, out_data) + 1]; if (out_op == DTM_DMI_OP_WRITE) {
unsigned int out_len = decode_dmi(target, out_text, out_address, out_data); char out_decoded[decode_dmi(target, NULL, out_address, out_data) + 1];
char in_text[decode_dmi(target, NULL, in_address, in_data) + 1]; decode_dmi(target, out_decoded, out_address, out_data);
unsigned int in_len = decode_dmi(target, in_text, in_address, in_data); log_printf_lf(LOG_LVL_DEBUG, __FILE__, __LINE__, __func__,
if (in_text[0] || out_text[0]) { "write: %s", out_decoded);
log_printf_lf(LOG_LVL_DEBUG, __FILE__, __LINE__, "scan", "%.*s -> %.*s", }
out_len, out_text, in_len, in_text); if (!discard_in && in_op == DTM_DMI_OP_SUCCESS) {
char in_decoded[decode_dmi(target, NULL, in_address, in_data) + 1];
decode_dmi(target, in_decoded, in_address, in_data);
log_printf_lf(LOG_LVL_DEBUG, __FILE__, __LINE__, __func__,
"read: %s", in_decoded);
} }
} }
@ -542,7 +545,7 @@ static dmi_status_t dmi_scan(struct target *target, uint32_t *address_in,
if (address_in) if (address_in)
*address_in = buf_get_u32(in, DTM_DMI_ADDRESS_OFFSET, info->abits); *address_in = buf_get_u32(in, DTM_DMI_ADDRESS_OFFSET, info->abits);
dump_field(target, idle_count, &field); dump_field(target, idle_count, &field, /*discard_in*/ !data_in);
return buf_get_u32(in, DTM_DMI_OP_OFFSET, DTM_DMI_OP_LENGTH); return buf_get_u32(in, DTM_DMI_OP_OFFSET, DTM_DMI_OP_LENGTH);
} }