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 #972 from en-sc/en-sc/decode-location 

target/riscv: report helpfull location during register decode
This commit is contained in:
Tim Newsome 2023-12-06 15:59:44 -08:00 committed by GitHub
parent d4c5d26570 560c338526
commit 7c94814221
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,16 +297,23 @@ static riscv_debug_reg_ctx_t get_riscv_debug_reg_ctx(struct target *target)
} }
static void log_debug_reg(struct target *target, enum riscv_debug_reg_ordinal reg, static void log_debug_reg(struct target *target, enum riscv_debug_reg_ordinal reg,
riscv_reg_t value) riscv_reg_t value, const char *file, unsigned int line, const char *func)
{ {
if (debug_level < LOG_LVL_DEBUG) if (debug_level < LOG_LVL_DEBUG)
return; return;
const riscv_debug_reg_ctx_t context = get_riscv_debug_reg_ctx(target); const riscv_debug_reg_ctx_t context = get_riscv_debug_reg_ctx(target);
char buf[riscv_debug_reg_to_s(NULL, reg, context, value) + 1]; char * const buf = malloc(riscv_debug_reg_to_s(NULL, reg, context, value) + 1);
if (!buf) {
LOG_ERROR("Unable to allocate memory.");
return;
}
riscv_debug_reg_to_s(buf, reg, context, value); riscv_debug_reg_to_s(buf, reg, context, value);
LOG_TARGET_DEBUG(target, "%s", buf); log_printf_lf(LOG_LVL_DEBUG, file, line, func, "[%s] %s", target_name(target), buf);
free(buf);
} }
#define LOG_DEBUG_REG(t, r, v) log_debug_reg(t, r##_ORDINAL, v, __FILE__, __LINE__, __func__)
static uint32_t set_dmcontrol_hartsel(uint32_t initial, int hart_index) static uint32_t set_dmcontrol_hartsel(uint32_t initial, int hart_index)
{ {
assert(hart_index != HART_INDEX_UNKNOWN); assert(hart_index != HART_INDEX_UNKNOWN);
@ -864,7 +871,7 @@ static int execute_abstract_command(struct target *target, uint32_t command)
if (debug_level >= LOG_LVL_DEBUG) { if (debug_level >= LOG_LVL_DEBUG) {
switch (get_field(command, DM_COMMAND_CMDTYPE)) { switch (get_field(command, DM_COMMAND_CMDTYPE)) {
case 0: case 0:
log_debug_reg(target, AC_ACCESS_REGISTER_ORDINAL, command); LOG_DEBUG_REG(target, AC_ACCESS_REGISTER, command);
break; break;
default: default:
LOG_TARGET_DEBUG(target, "command=0x%x", command); LOG_TARGET_DEBUG(target, "command=0x%x", command);
@ -1860,7 +1867,7 @@ static int examine(struct target *target)
} }
LOG_TARGET_DEBUG(target, "dtmcontrol=0x%x", dtmcontrol); LOG_TARGET_DEBUG(target, "dtmcontrol=0x%x", dtmcontrol);
log_debug_reg(target, DTM_DTMCS_ORDINAL, dtmcontrol); LOG_DEBUG_REG(target, DTM_DTMCS, dtmcontrol);
if (get_field(dtmcontrol, DTM_DTMCS_VERSION) != 1) { if (get_field(dtmcontrol, DTM_DTMCS_VERSION) != 1) {
LOG_TARGET_ERROR(target, "Unsupported DTM version %" PRIu32 ". (dtmcontrol=0x%" PRIx32 ")", LOG_TARGET_ERROR(target, "Unsupported DTM version %" PRIu32 ". (dtmcontrol=0x%" PRIx32 ")",