X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=71e047f40e9705224f4f2d409ed8d8b308d89a11;hp=62b22389a9b68fe2fa7d2de6992840ab9043b518;hb=8e4c80c17d6abea8754ab29aa5285ae10e6e273b;hpb=50e79d60ce148f86bc93cc3248c3f6f0f81b3c3e diff --git a/src/openocd.c b/src/openocd.c index 62b22389a9..71e047f40e 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -31,7 +31,7 @@ #include "openocd.h" #include #include -#include +#include #include #include #include @@ -47,39 +47,35 @@ #include #endif - -#define OPENOCD_VERSION \ - "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")" +#define OPENOCD_VERSION \ + "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")" /* Give scripts and TELNET a way to find out what version this is */ static int jim_version_command(Jim_Interp *interp, int argc, - Jim_Obj * const *argv) + Jim_Obj * const *argv) { if (argc > 2) - { return JIM_ERR; - } const char *str = ""; - char * version_str; + char *version_str; version_str = OPENOCD_VERSION; - + if (argc == 2) str = Jim_GetString(argv[1], NULL); if (strcmp("git", str) == 0) - { version_str = GITVERSION; - } - + Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1)); return JIM_OK; } -static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv) +static int log_target_callback_event_handler(struct target *target, + enum target_event event, + void *priv) { - switch (event) - { + switch (event) { case TARGET_EVENT_GDB_START: target->display = 0; break; @@ -87,8 +83,7 @@ static int log_target_callback_event_handler(struct target *target, enum target_ target->display = 1; break; case TARGET_EVENT_HALTED: - if (target->display) - { + if (target->display) { /* do not display information when debugger caused the halt */ target_arch_state(target); } @@ -118,7 +113,7 @@ COMMAND_HANDLER(handle_init_command) return ERROR_COMMAND_SYNTAX_ERROR; int retval; - static int initialized = 0; + static int initialized; if (initialized) return ERROR_OK; @@ -128,8 +123,8 @@ COMMAND_HANDLER(handle_init_command) if (ERROR_OK != retval) return ERROR_FAIL; - if ((retval = adapter_init(CMD_CTX)) != ERROR_OK) - { + retval = adapter_init(CMD_CTX); + if (retval != ERROR_OK) { /* we must be able to set up the debug adapter */ return retval; } @@ -184,29 +179,6 @@ COMMAND_HANDLER(handle_add_script_search_dir_command) return ERROR_OK; } - -static int jim_stacktrace_command(Jim_Interp *interp, int argc, - Jim_Obj * const *argv) -{ - if (argc != 1) - { - return JIM_ERR; - } - Jim_Obj * stacktrace = Jim_DuplicateObj(interp, interp->stackTrace); - - /* insert actual error site at beginning of list*/ - Jim_Obj *procname = Jim_NewStringObj(interp, "", -1); /* Uhhh... don't know this one. */ - Jim_ListInsertElements(interp, stacktrace, 0, 1, &procname); - Jim_Obj *filename = Jim_NewStringObj(interp, interp->errorFileName, -1); - Jim_ListInsertElements(interp, stacktrace, 1, 1, &filename); - Jim_Obj *line = Jim_NewIntObj(interp, interp->errorLine); - Jim_ListInsertElements(interp, stacktrace, 2, 1, &line); - - Jim_SetResult(interp, stacktrace); - - return JIM_OK; -} - static const struct command_registration openocd_command_handlers[] = { { .name = "version", @@ -219,6 +191,7 @@ static const struct command_registration openocd_command_handlers[] = { .handler = &handle_noinit_command, .mode = COMMAND_CONFIG, .help = "Prevent 'init' from being called at startup.", + .usage = "" }, { .name = "init", @@ -228,22 +201,14 @@ static const struct command_registration openocd_command_handlers[] = { "Changes command mode from CONFIG to EXEC. " "Unless 'noinit' is called, this command is " "called automatically at the end of startup.", - + .usage = "" }, { .name = "add_script_search_dir", .handler = &handle_add_script_search_dir_command, .mode = COMMAND_ANY, .help = "dir to search for config files and scripts", - - }, - { - .name = "stacktrace", - .jim_handler = jim_stacktrace_command, - .mode = COMMAND_ANY, - .help = "returns the stacktrace as a list of triples: proc, file, line." - "The stack trace is reset when a new stack trace is being built after " - "a new failure has occurred.", + .usage = "" }, COMMAND_REGISTRATION_DONE }; @@ -282,11 +247,9 @@ struct command_context *setup_command_handler(Jim_Interp *interp) &mflash_register_commands, NULL }; - for (unsigned i = 0; NULL != command_registrants[i]; i++) - { + for (unsigned i = 0; NULL != command_registrants[i]; i++) { int retval = (*command_registrants[i])(cmd_ctx); - if (ERROR_OK != retval) - { + if (ERROR_OK != retval) { command_done(cmd_ctx); return NULL; } @@ -294,13 +257,48 @@ struct command_context *setup_command_handler(Jim_Interp *interp) LOG_DEBUG("command registration: complete"); LOG_OUTPUT(OPENOCD_VERSION "\n" - "Licensed under GNU GPL v2\n"); + "Licensed under GNU GPL v2\n"); global_cmd_ctx = cmd_ctx; return cmd_ctx; } +/** OpenOCD runtime meat that can become single-thread in future. It parse + * commandline, reads configuration, sets up the target and starts server loop. + * Commandline arguments are passed into this function from openocd_main(). + */ +static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ctx) +{ + int ret; + + if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK) + return EXIT_FAILURE; + + if (server_preinit() != ERROR_OK) + return EXIT_FAILURE; + + ret = parse_config_file(cmd_ctx); + if (ret != ERROR_OK) + return EXIT_FAILURE; + + ret = server_init(cmd_ctx); + if (ERROR_OK != ret) + return EXIT_FAILURE; + + if (init_at_startup) { + ret = command_run_line(cmd_ctx, "init"); + if (ERROR_OK != ret) + return EXIT_FAILURE; + } + + server_loop(cmd_ctx); + + server_quit(); + + return ret; +} + /* normally this is the main() function entry, but if OpenOCD is linked * into application, then this fn will not be invoked, but rather that * application will have it's own implementation of main(). */ @@ -320,42 +318,14 @@ int openocd_main(int argc, char *argv[]) return EXIT_FAILURE; LOG_OUTPUT("For bug reports, read\n\t" - "http://openocd.berlios.de/doc/doxygen/bugs.html" + "http://openocd.sourceforge.net/doc/doxygen/bugs.html" "\n"); command_context_mode(cmd_ctx, COMMAND_CONFIG); command_set_output_handler(cmd_ctx, configuration_output_handler, NULL); - if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK) - return EXIT_FAILURE; - - if (server_preinit() != ERROR_OK) - return EXIT_FAILURE; - - ret = parse_config_file(cmd_ctx); - if (ret != ERROR_OK) - return EXIT_FAILURE; - - ret = server_init(cmd_ctx); - if (ERROR_OK != ret) - return EXIT_FAILURE; - - ret = command_run_line(cmd_ctx, "init_targets"); - if (ERROR_OK != ret) - ret = EXIT_FAILURE; - - if (init_at_startup) - { - ret = command_run_line(cmd_ctx, "init"); - if (ERROR_OK != ret) - ret = EXIT_FAILURE; - } - - /* handle network connections */ - if (ERROR_OK == ret) - server_loop(cmd_ctx); - - server_quit(); + /* Start the executable meat that can evolve into thread in future. */ + ret = openocd_thread(argc, argv, cmd_ctx); unregister_all_commands(cmd_ctx, NULL);