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

arm_adi_v5: separate ROM table parsing from command output [3/3] 

This change only targets the output of rtp_rom_loop().

Change-Id: If9ac013798923428c3b897a969887e98b6935a2b
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/6821
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2022-01-16 14:02:43 +01:00
parent c83b94b2c8
commit d01b3d69ec
1 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/target/arm_adi_v5.c
View File

@ -1491,6 +1491,9 @@ static int dap_info_mem_ap_header(struct command_invocation *cmd,
target_addr_t dbgbase, uint32_t apid); target_addr_t dbgbase, uint32_t apid);
static int dap_info_cs_component(struct command_invocation *cmd, static int dap_info_cs_component(struct command_invocation *cmd,
int retval, struct cs_component_vals *v, int depth); int retval, struct cs_component_vals *v, int depth);
static int dap_info_rom_table_entry(struct command_invocation *cmd,
int retval, int depth,
unsigned int offset, uint32_t romentry);
static int rtp_cs_component(struct command_invocation *cmd, static int rtp_cs_component(struct command_invocation *cmd,
struct adiv5_ap *ap, target_addr_t dbgbase, int depth); struct adiv5_ap *ap, target_addr_t dbgbase, int depth);
@ -1501,11 +1504,6 @@ static int rtp_rom_loop(struct command_invocation *cmd,
{ {
assert(IS_ALIGNED(base_address, ARM_CS_ALIGN)); assert(IS_ALIGNED(base_address, ARM_CS_ALIGN));
char tabs[16] = "";
if (depth)
snprintf(tabs, sizeof(tabs), "[L%02d] ", depth);
unsigned int offset = 0; unsigned int offset = 0;
while (max_entries--) { while (max_entries--) {
uint32_t romentry; uint32_t romentry;
@ -1513,26 +1511,20 @@ static int rtp_rom_loop(struct command_invocation *cmd,
int retval = mem_ap_read_atomic_u32(ap, base_address + offset, &romentry); int retval = mem_ap_read_atomic_u32(ap, base_address + offset, &romentry);
offset += 4; offset += 4;
if (retval != ERROR_OK) { if (retval != ERROR_OK)
LOG_DEBUG("Failed read ROM table entry"); LOG_DEBUG("Failed read ROM table entry");
command_print(cmd, "\t%sROMTABLE[0x%x] Read error", tabs, saved_offset);
command_print(cmd, "\t\tUnable to continue");
command_print(cmd, "\t%s\tStop parsing of ROM table", tabs);
return retval;
}
command_print(cmd, "\t%sROMTABLE[0x%x] = 0x%08" PRIx32, retval = dap_info_rom_table_entry(cmd, retval, depth, saved_offset, romentry);
tabs, saved_offset, romentry); if (retval != ERROR_OK)
return retval;
if (romentry == 0) { if (romentry == 0) {
command_print(cmd, "\t%s\tEnd of ROM table", tabs); /* End of ROM table */
break; break;
} }
if (!(romentry & ARM_CS_ROMENTRY_PRESENT)) { if (!(romentry & ARM_CS_ROMENTRY_PRESENT))
command_print(cmd, "\t\tComponent not present");
continue; continue;
}
/* Recurse. "romentry" is signed */ /* Recurse. "romentry" is signed */
target_addr_t component_base = base_address + (int32_t)(romentry & ARM_CS_ROMENTRY_OFFSET_MASK); target_addr_t component_base = base_address + (int32_t)(romentry & ARM_CS_ROMENTRY_OFFSET_MASK);
@ -1753,6 +1745,38 @@ static int dap_info_cs_component(struct command_invocation *cmd,
return ERROR_OK; return ERROR_OK;
} }
static int dap_info_rom_table_entry(struct command_invocation *cmd,
int retval, int depth,
unsigned int offset, uint32_t romentry)
{
char tabs[16] = "";
if (depth)
snprintf(tabs, sizeof(tabs), "[L%02d] ", depth);
if (retval != ERROR_OK) {
command_print(cmd, "\t%sROMTABLE[0x%x] Read error", tabs, offset);
command_print(cmd, "\t\tUnable to continue");
command_print(cmd, "\t%s\tStop parsing of ROM table", tabs);
return retval;
}
command_print(cmd, "\t%sROMTABLE[0x%x] = 0x%08" PRIx32,
tabs, offset, romentry);
if (romentry == 0) {
command_print(cmd, "\t%s\tEnd of ROM table", tabs);
return ERROR_OK;
}
if (!(romentry & ARM_CS_ROMENTRY_PRESENT)) {
command_print(cmd, "\t\tComponent not present");
return ERROR_OK;
}
return ERROR_OK;
}
enum adiv5_cfg_param { enum adiv5_cfg_param {
CFG_DAP, CFG_DAP,
CFG_AP_NUM, CFG_AP_NUM,