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

target: change prototype of handle_bp_command_set() 

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_set() 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: If00f9cfb784b53bb3df92d4469178e2f930a146a
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/5076
Tested-by: jenkins
This commit is contained in:
Paul Fertser 2019-04-01 05:19:21 +02:00 committed by Tomas Vanek
parent fa765f1374
commit 20184ea861
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/target/target.c
View File

@ -3729,17 +3729,17 @@ static int handle_bp_command_list(struct command_invocation *cmd)
return ERROR_OK; return ERROR_OK;
} }
static int handle_bp_command_set(struct command_context *cmd_ctx, static int handle_bp_command_set(struct command_invocation *cmd,
target_addr_t addr, uint32_t asid, uint32_t length, int hw) target_addr_t addr, uint32_t asid, uint32_t length, int hw)
{ {
struct target *target = get_current_target(cmd_ctx); struct target *target = get_current_target(cmd->ctx);
int retval; int retval;
if (asid == 0) { if (asid == 0) {
retval = breakpoint_add(target, addr, length, hw); retval = breakpoint_add(target, addr, length, hw);
/* error is always logged in breakpoint_add(), do not print it again */ /* error is always logged in breakpoint_add(), do not print it again */
if (ERROR_OK == retval) if (ERROR_OK == retval)
command_print(cmd_ctx, "breakpoint set at " TARGET_ADDR_FMT "", addr); command_print(cmd->ctx, "breakpoint set at " TARGET_ADDR_FMT "", addr);
} else if (addr == 0) { } else if (addr == 0) {
if (target->type->add_context_breakpoint == NULL) { if (target->type->add_context_breakpoint == NULL) {
@ -3749,7 +3749,7 @@ static int handle_bp_command_set(struct command_context *cmd_ctx,
retval = context_breakpoint_add(target, asid, length, hw); retval = context_breakpoint_add(target, asid, length, hw);
/* error is always logged in context_breakpoint_add(), do not print it again */ /* error is always logged in context_breakpoint_add(), do not print it again */
if (ERROR_OK == retval) if (ERROR_OK == retval)
command_print(cmd_ctx, "Context breakpoint set at 0x%8.8" PRIx32 "", asid); command_print(cmd->ctx, "Context breakpoint set at 0x%8.8" PRIx32 "", asid);
} else { } else {
if (target->type->add_hybrid_breakpoint == NULL) { if (target->type->add_hybrid_breakpoint == NULL) {
@ -3759,7 +3759,7 @@ static int handle_bp_command_set(struct command_context *cmd_ctx,
retval = hybrid_breakpoint_add(target, addr, asid, length, hw); retval = hybrid_breakpoint_add(target, addr, asid, length, hw);
/* error is always logged in hybrid_breakpoint_add(), do not print it again */ /* error is always logged in hybrid_breakpoint_add(), do not print it again */
if (ERROR_OK == retval) if (ERROR_OK == retval)
command_print(cmd_ctx, "Hybrid breakpoint set at 0x%8.8" PRIx32 "", asid); command_print(cmd->ctx, "Hybrid breakpoint set at 0x%8.8" PRIx32 "", asid);
} }
return retval; return retval;
} }
@ -3779,7 +3779,7 @@ COMMAND_HANDLER(handle_bp_command)
asid = 0; asid = 0;
COMMAND_PARSE_ADDRESS(CMD_ARGV[0], addr); COMMAND_PARSE_ADDRESS(CMD_ARGV[0], addr);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], length); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], length);
return handle_bp_command_set(CMD_CTX, addr, asid, length, hw); return handle_bp_command_set(CMD, addr, asid, length, hw);
case 3: case 3:
if (strcmp(CMD_ARGV[2], "hw") == 0) { if (strcmp(CMD_ARGV[2], "hw") == 0) {
@ -3787,13 +3787,13 @@ COMMAND_HANDLER(handle_bp_command)
COMMAND_PARSE_ADDRESS(CMD_ARGV[0], addr); COMMAND_PARSE_ADDRESS(CMD_ARGV[0], addr);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], length); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], length);
asid = 0; asid = 0;
return handle_bp_command_set(CMD_CTX, addr, asid, length, hw); return handle_bp_command_set(CMD, addr, asid, length, hw);
} else if (strcmp(CMD_ARGV[2], "hw_ctx") == 0) { } else if (strcmp(CMD_ARGV[2], "hw_ctx") == 0) {
hw = BKPT_HARD; hw = BKPT_HARD;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], asid); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], asid);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], length); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], length);
addr = 0; addr = 0;
return handle_bp_command_set(CMD_CTX, addr, asid, length, hw); return handle_bp_command_set(CMD, addr, asid, length, hw);
} }
/* fallthrough */ /* fallthrough */
case 4: case 4:
@ -3801,7 +3801,7 @@ COMMAND_HANDLER(handle_bp_command)
COMMAND_PARSE_ADDRESS(CMD_ARGV[0], addr); COMMAND_PARSE_ADDRESS(CMD_ARGV[0], addr);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], asid); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], asid);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], length); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], length);
return handle_bp_command_set(CMD_CTX, addr, asid, length, hw); return handle_bp_command_set(CMD, addr, asid, length, hw);
default: default:
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;