X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fcommand.h;h=837b4bdd2cc77339f5a252e5f2bc3018d74a95b3;hp=c574efd507e2f03511e4b84e1c46f4cc5a4a604f;hb=5458fef43ca7072312440301a9469c686ca641e2;hpb=73349dc5ac33e904a1311829f2e42d923309e744 diff --git a/src/helper/command.h b/src/helper/command.h index c574efd507..837b4bdd2c 100644 --- a/src/helper/command.h +++ b/src/helper/command.h @@ -35,9 +35,10 @@ #include "jim.h" #endif -/* To achieve C99 printf compatibility in MinGW, gnu_printf should */ -/* be used for __attribute__((format( ... ))) */ -#ifdef IS_MINGW +/* To achieve C99 printf compatibility in MinGW, gnu_printf should be + * used for __attribute__((format( ... ))), with GCC v4.4 or later + */ +#if (defined(IS_MINGW) && (((__GNUC__ << 16) + __GNUC_MINOR__) >= 0x00040004)) #define PRINTF_ATTRIBUTE_FORMAT gnu_printf #else #define PRINTF_ATTRIBUTE_FORMAT printf @@ -50,10 +51,16 @@ enum command_mode COMMAND_ANY, }; -typedef struct command_context_s +struct command_context; + +/// The type signature for command context's output handler. +typedef int (*command_output_handler_t)(struct command_context *context, + const char* line); + +struct command_context { enum command_mode mode; - struct command_s *commands; + struct command *commands; int current_target; /* Execute a command. * @@ -69,39 +76,178 @@ typedef struct command_context_s * Returning ERROR_COMMAND_SYNTAX_ERROR will have the effect of * printing out the syntax of the command. */ - int (*output_handler)(struct command_context_s *context, const char* line); + command_output_handler_t output_handler; void *output_handler_priv; -} command_context_t; +}; + +/** + * When run_command is called, a new instance will be created on the + * stack, filled with the proper values, and passed by reference to the + * required COMMAND_HANDLER routine. + */ +struct command_invocation { + struct command_context *ctx; + const char *name; + unsigned argc; + const char **argv; +}; + +/** + * Command handlers may be defined with more parameters than the base + * set provided by command.c. This macro uses C99 magic to allow + * defining all such derivative types using this macro. + */ +#define __COMMAND_HANDLER(name, extra...) \ + int name(struct command_invocation *cmd, ##extra) + +/** + * Use this to macro to call a command helper (or a nested handler). + * It provides command handler authors protection against reordering or + * removal of unused parameters. + * + * @b Note: This macro uses lexical capture to provide some arguments. + * As a result, this macro should be used @b only within functions + * defined by the COMMAND_HANDLER or COMMAND_HELPER macros. Those + * macros provide the expected lexical context captured by this macro. + * Furthermore, it should be used only from the top-level of handler or + * helper function, or care must be taken to avoid redefining the same + * variables in intervening scope(s) by accident. + */ +#define CALL_COMMAND_HANDLER(name, extra...) \ + name(cmd, ##extra) -typedef struct command_s +/** + * Always use this macro to define new command handler functions. + * It ensures the parameters are ordered, typed, and named properly, so + * they be can be used by other macros (e.g. COMMAND_PARSE_NUMBER). + * All command handler functions must be defined as static in scope. + */ +#define COMMAND_HANDLER(name) static __COMMAND_HANDLER(name) + +/** + * Similar to COMMAND_HANDLER, except some parameters are expected. + * A helper is globally-scoped because it may be shared between several + * source files (e.g. the s3c24xx device command helper). + */ +#define COMMAND_HELPER(name, extra...) __COMMAND_HANDLER(name, extra) + +/** + * Use this macro to access the context of the command being handled, + * rather than accessing the variable directly. It may be moved. + */ +#define CMD_CTX cmd->ctx +/** + * Use this macro to access the number of arguments for the command being + * handled, rather than accessing the variable directly. It may be moved. + */ +#define CMD_ARGC cmd->argc +/** + * Use this macro to access the arguments for the command being handled, + * rather than accessing the variable directly. It may be moved. + */ +#define CMD_ARGV cmd->argv +/** + * Use this macro to access the name of the command being handled, + * rather than accessing the variable directly. It may be moved. + */ +#define CMD_NAME cmd->name + + +/// The type signature for commands' handler functions. +typedef __COMMAND_HANDLER((*command_handler_t)); + +struct command { char *name; - struct command_s *parent; - struct command_s *children; - int (*handler)(struct command_context_s *context, char* name, char** args, int argc); + const char *help; + struct command *parent; + struct command *children; + command_handler_t handler; enum command_mode mode; - struct command_s *next; -} command_t; - -extern command_t* register_command(command_context_t *context, command_t *parent, char *name, int (*handler)(struct command_context_s *context, char* name, char** args, int argc), enum command_mode mode, char *help); -extern int unregister_command(command_context_t *context, char *name); -extern int unregister_all_commands(command_context_t *context); -extern void command_set_output_handler(command_context_t* context, int (*output_handler)(struct command_context_s *context, const char* line), void *priv); -extern command_context_t* copy_command_context(command_context_t* context); -extern int command_context_mode(command_context_t *context, enum command_mode mode); -extern command_context_t* command_init(void); -extern int command_done(command_context_t *context); - -extern void command_print(command_context_t *context, const char *format, ...) + struct command *next; +}; + +/** + * @param c The command to be named. + * @param delim The character to place between command names. + * @returns A malloc'd string containing the full command name, + * which may include one or more ancestor components. Multiple names + * are separated by single spaces. The caller must free() the string + * when done with it. + */ +char *command_name(struct command *c, char delim); + +/** + * Register a command @c handler that can be called from scripts during + * the execution @c mode specified. + * + * If @c parent is non-NULL, the new command will be registered as a + * sub-command under it; otherwise, it will be available as a top-level + * command. + * + * A conventioal format should be used for help strings, to provide both + * usage and basic information: + * @code + * "@ ... - some explanation text" + * @endcode + * + * @param cmd_ctx The command_context in which to register the command. + * @param parent Register this command as a child of this, or NULL to + * register a top-level command. + * @param name The name of the command to register, which must not have + * been registered previously. + * @param handler The callback function that will be called. If NULL, + * then the command serves as a placeholder for its children or a script. + * @param mode The command mode(s) in which this command may be run. + * @param help The help text that will be displayed to the user. + * @returns The new command, if successful; otherwise, NULL. + */ +struct command* register_command(struct command_context *cmd_ctx, + struct command *parent, const char *name, + command_handler_t handler, enum command_mode mode, + const char *help); + +/** + * Unregisters command @c name from the given context, @c cmd_ctx. + * @param cmd_ctx The context of the registered command. + * @param parent The parent of the given command, or NULL. + * @param name The name of the command to unregister. + * @returns ERROR_OK on success, or an error code. + */ +int unregister_command(struct command_context *cmd_ctx, + struct command *parent, const char *name); +/** + * Unregisters all commands from the specfied context. + * @param cmd_ctx The context that will be cleared of registered commands. + * @param parent If given, only clear commands from under this one command. + * @returns ERROR_OK on success, or an error code. + */ +int unregister_all_commands(struct command_context *cmd_ctx, + struct command *parent); + +void command_set_output_handler(struct command_context* context, + command_output_handler_t output_handler, void *priv); + +struct command_context* copy_command_context(struct command_context* context); + +int command_context_mode(struct command_context *context, enum command_mode mode); + +/** + * Creates a new command context using the startup TCL provided. + */ +struct command_context* command_init(const char *startup_tcl); +int command_done(struct command_context *context); + +void command_print(struct command_context *context, const char *format, ...) __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3))); -extern void command_print_sameline(command_context_t *context, const char *format, ...) +void command_print_sameline(struct command_context *context, const char *format, ...) __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3))); -extern int command_run_line(command_context_t *context, char *line); -extern int command_run_linef(command_context_t *context, const char *format, ...) +int command_run_line(struct command_context *context, char *line); +int command_run_linef(struct command_context *context, const char *format, ...) __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3))); -extern void command_output_text(command_context_t *context, const char *data); +void command_output_text(struct command_context *context, const char *data); -extern void process_jim_events(void); +void process_jim_events(void); #define ERROR_COMMAND_CLOSE_CONNECTION (-600) #define ERROR_COMMAND_SYNTAX_ERROR (-601) @@ -110,13 +256,10 @@ extern void process_jim_events(void); #define ERROR_COMMAND_ARGUMENT_OVERFLOW (-604) #define ERROR_COMMAND_ARGUMENT_UNDERFLOW (-605) -extern int fast_and_dangerous; - extern Jim_Interp *interp; -void register_jim(command_context_t *context, const char *name, int (*cmd)(Jim_Interp *interp, int argc, Jim_Obj *const *argv), const char *help); - -long jim_global_long(const char *variable); +void register_jim(struct command_context *context, const char *name, + Jim_CmdProc cmd, const char *help); int parse_ulong(const char *str, unsigned long *ul); int parse_ullong(const char *str, unsigned long long *ul); @@ -137,6 +280,58 @@ DECLARE_PARSE_WRAPPER(_s32, int32_t); DECLARE_PARSE_WRAPPER(_s16, int16_t); DECLARE_PARSE_WRAPPER(_s8, int8_t); -void script_debug(Jim_Interp *interp, const char *cmd, int argc, Jim_Obj *const *argv); +/** + * @brief parses the string @a in into @a out as a @a type, or prints + * a command error and passes the error code to the caller. If an error + * does occur, the calling function will return the error code produced + * by the parsing function (one of ERROR_COMMAND_ARGUMENT_*). + * + * This function may cause the calling function to return immediately, + * so it should be used carefully to avoid leaking resources. In most + * situations, parsing should be completed in full before proceding + * to allocate resources, and this strategy will most prevents leaks. + */ +#define COMMAND_PARSE_NUMBER(type, in, out) \ + do { \ + int retval = parse_##type(in, &(out)); \ + if (ERROR_OK != retval) { \ + command_print(CMD_CTX, stringify(out) \ + " option value ('%s') is not valid", in); \ + return retval; \ + } \ + } while (0) + +/** + * Parse the string @c as a binary parameter, storing the boolean value + * in @c out. The strings @c on and @c off are used to match different + * strings for true and false options (e.g. "on" and "off" or + * "enable" and "disable"). + */ +#define COMMAND_PARSE_BOOL(in, out, on, off) \ + do { \ + bool value; \ + int retval = command_parse_bool_arg(in, &value); \ + if (ERROR_OK != retval) { \ + command_print(CMD_CTX, stringify(out) \ + " option value ('%s') is not valid", in); \ + command_print(CMD_CTX, " choices are '%s' or '%s'", \ + on, off); \ + return retval; \ + } \ + out = value; \ + } while (0) + +int command_parse_bool_arg(const char *in, bool *out); +COMMAND_HELPER(handle_command_parse_bool, bool *out, const char *label); + +/// parses an on/off command argument +#define COMMAND_PARSE_ON_OFF(in, out) \ + COMMAND_PARSE_BOOL(in, out, "on", "off") +/// parses an enable/disable command argument +#define COMMAND_PARSE_ENABLE(in, out) \ + COMMAND_PARSE_BOOL(in, out, "enable", "disable") + +void script_debug(Jim_Interp *interp, const char *cmd, + unsigned argc, Jim_Obj *const *argv); #endif /* COMMAND_H */