use CALL_COMMAND_HANDLER instead of direct calls
By using CALL_COMMAND_HANDLER, parameters can be reordered, added, or even removed in inherited signatures, without requiring revisiting all of the various call sites.
This commit is contained in:
@@ -2029,7 +2029,8 @@ static COMMAND_HELPER(arm11_handle_bool, bool *var, char *name)
|
||||
#define BOOL_WRAPPER(name, print_name) \
|
||||
COMMAND_HANDLER(arm11_handle_bool_##name) \
|
||||
{ \
|
||||
return arm11_handle_bool(cmd_ctx, cmd, args, argc, &arm11_config_##name, print_name); \
|
||||
return CALL_COMMAND_HANDLER(arm11_handle_bool, \
|
||||
&arm11_config_##name, print_name); \
|
||||
}
|
||||
|
||||
BOOL_WRAPPER(memwrite_burst, "memory write burst mode")
|
||||
@@ -2186,12 +2187,12 @@ static COMMAND_HELPER(arm11_handle_etm_read_write, bool read)
|
||||
|
||||
COMMAND_HANDLER(arm11_handle_etmr)
|
||||
{
|
||||
return arm11_handle_etm_read_write(cmd_ctx, cmd, args, argc, true);
|
||||
return CALL_COMMAND_HANDLER(arm11_handle_etm_read_write, true);
|
||||
}
|
||||
|
||||
COMMAND_HANDLER(arm11_handle_etmw)
|
||||
{
|
||||
return arm11_handle_etm_read_write(cmd_ctx, cmd, args, argc, false);
|
||||
return CALL_COMMAND_HANDLER(arm11_handle_etm_read_write, false);
|
||||
}
|
||||
|
||||
#define ARM11_HANDLER(x) .x = arm11_##x
|
||||
|
||||
@@ -1271,7 +1271,7 @@ COMMAND_HANDLER(handle_etm_tracemode_command)
|
||||
case 0:
|
||||
break;
|
||||
case 4:
|
||||
handle_etm_tracemode_command_update(cmd_ctx, cmd, args, argc, &tracemode);
|
||||
CALL_COMMAND_HANDLER(handle_etm_tracemode_command_update, &tracemode);
|
||||
break;
|
||||
default:
|
||||
command_print(cmd_ctx, "usage: configure trace mode "
|
||||
|
||||
@@ -2121,7 +2121,7 @@ COMMAND_HANDLER(handle_halt_command)
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
return handle_wait_halt_command(cmd_ctx, cmd, args, argc);
|
||||
return CALL_COMMAND_HANDLER(handle_wait_halt_command);
|
||||
}
|
||||
|
||||
COMMAND_HANDLER(handle_soft_reset_halt_command)
|
||||
@@ -2410,7 +2410,7 @@ COMMAND_HANDLER(handle_load_image_command)
|
||||
int i;
|
||||
image_t image;
|
||||
|
||||
int retval = parse_load_image_command_args(cmd_ctx, cmd, args, argc,
|
||||
int retval = CALL_COMMAND_HANDLER(parse_load_image_command_args,
|
||||
&image, &min_address, &max_address);
|
||||
if (ERROR_OK != retval)
|
||||
return retval;
|
||||
@@ -2701,12 +2701,12 @@ done:
|
||||
|
||||
COMMAND_HANDLER(handle_verify_image_command)
|
||||
{
|
||||
return handle_verify_image_command_internal(cmd_ctx, cmd, args, argc, 1);
|
||||
return CALL_COMMAND_HANDLER(handle_verify_image_command_internal, 1);
|
||||
}
|
||||
|
||||
COMMAND_HANDLER(handle_test_image_command)
|
||||
{
|
||||
return handle_verify_image_command_internal(cmd_ctx, cmd, args, argc, 0);
|
||||
return CALL_COMMAND_HANDLER(handle_verify_image_command_internal, 0);
|
||||
}
|
||||
|
||||
static int handle_bp_command_list(struct command_context_s *cmd_ctx)
|
||||
@@ -4547,7 +4547,7 @@ COMMAND_HANDLER(handle_fast_load_image_command)
|
||||
|
||||
image_t image;
|
||||
|
||||
int retval = parse_load_image_command_args(cmd_ctx, cmd, args, argc,
|
||||
int retval = CALL_COMMAND_HANDLER(parse_load_image_command_args,
|
||||
&image, &min_address, &max_address);
|
||||
if (ERROR_OK != retval)
|
||||
return retval;
|
||||
|
||||
Reference in New Issue
Block a user