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

target: change prototype of handle_bp_command_list() 

To prepare for handling TCL return values consistently, all calls
to command_print/command_print_sameline should be ready to switch
to CMD as first parameter.

Change prototype of handle_bp_command_list() to pass CMD instead
of CMD_CTX.

This change was part of http://openocd.zylin.com/1815 from Paul
Fertser and has been extracted and rebased to simplify the review.

Change-Id: Ibff636d476bcd59784ce3da5409d930225cfe637
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5075
Tested-by: jenkins
bscan_optimization
Paul Fertser 2019-04-01 05:17:07 +02:00 committed by Tomas Vanek
parent eaa70635dc
commit fa765f1374
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/target/target.c
View File

@ -3694,32 +3694,32 @@ COMMAND_HANDLER(handle_test_image_command)
return CALL_COMMAND_HANDLER(handle_verify_image_command_internal, IMAGE_TEST); return CALL_COMMAND_HANDLER(handle_verify_image_command_internal, IMAGE_TEST);
} }
static int handle_bp_command_list(struct command_context *cmd_ctx) static int handle_bp_command_list(struct command_invocation *cmd)
{ {
struct target *target = get_current_target(cmd_ctx); struct target *target = get_current_target(cmd->ctx);
struct breakpoint *breakpoint = target->breakpoints; struct breakpoint *breakpoint = target->breakpoints;
while (breakpoint) { while (breakpoint) {
if (breakpoint->type == BKPT_SOFT) { if (breakpoint->type == BKPT_SOFT) {
char *buf = buf_to_str(breakpoint->orig_instr, char *buf = buf_to_str(breakpoint->orig_instr,
breakpoint->length, 16); breakpoint->length, 16);
command_print(cmd_ctx, "IVA breakpoint: " TARGET_ADDR_FMT ", 0x%x, %i, 0x%s", command_print(cmd->ctx, "IVA breakpoint: " TARGET_ADDR_FMT ", 0x%x, %i, 0x%s",
breakpoint->address, breakpoint->address,
breakpoint->length, breakpoint->length,
breakpoint->set, buf); breakpoint->set, buf);
free(buf); free(buf);
} else { } else {
if ((breakpoint->address == 0) && (breakpoint->asid != 0)) if ((breakpoint->address == 0) && (breakpoint->asid != 0))
command_print(cmd_ctx, "Context breakpoint: 0x%8.8" PRIx32 ", 0x%x, %i", command_print(cmd->ctx, "Context breakpoint: 0x%8.8" PRIx32 ", 0x%x, %i",
breakpoint->asid, breakpoint->asid,
breakpoint->length, breakpoint->set); breakpoint->length, breakpoint->set);
else if ((breakpoint->address != 0) && (breakpoint->asid != 0)) { else if ((breakpoint->address != 0) && (breakpoint->asid != 0)) {
command_print(cmd_ctx, "Hybrid breakpoint(IVA): " TARGET_ADDR_FMT ", 0x%x, %i", command_print(cmd->ctx, "Hybrid breakpoint(IVA): " TARGET_ADDR_FMT ", 0x%x, %i",
breakpoint->address, breakpoint->address,
breakpoint->length, breakpoint->set); breakpoint->length, breakpoint->set);
command_print(cmd_ctx, "\t|--->linked with ContextID: 0x%8.8" PRIx32, command_print(cmd->ctx, "\t|--->linked with ContextID: 0x%8.8" PRIx32,
breakpoint->asid); breakpoint->asid);
} else } else
command_print(cmd_ctx, "Breakpoint(IVA): " TARGET_ADDR_FMT ", 0x%x, %i", command_print(cmd->ctx, "Breakpoint(IVA): " TARGET_ADDR_FMT ", 0x%x, %i",
breakpoint->address, breakpoint->address,
breakpoint->length, breakpoint->set); breakpoint->length, breakpoint->set);
} }
@ -3773,7 +3773,7 @@ COMMAND_HANDLER(handle_bp_command)
switch (CMD_ARGC) { switch (CMD_ARGC) {
case 0: case 0:
return handle_bp_command_list(CMD_CTX); return handle_bp_command_list(CMD);
case 2: case 2:
asid = 0; asid = 0;