X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fopenocd.c;h=60cbf232a61d1c8e68f006a2d5c3dc2606791149;hb=fa5b0833d5fd146e9ceb9a91b2e8e6364f3bf53a;hp=5ce01e82bd2892ad46759908995e2ef507ce9302;hpb=fdae51287cf55a039f3401ed92151dbf518e4e7f;p=fw%2Fopenocd diff --git a/src/openocd.c b/src/openocd.c index 5ce01e82b..60cbf232a 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -31,7 +31,7 @@ #include "openocd.h" #include #include -#include +#include #include #include #include @@ -47,7 +47,6 @@ #include #endif - #define OPENOCD_VERSION \ "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")" @@ -62,15 +61,15 @@ static int jim_version_command(Jim_Interp *interp, int argc, const char *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; @@ -184,29 +183,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 +195,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 +205,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 }; @@ -267,7 +236,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp) struct command_context *cmd_ctx = command_init(startup, interp); /* register subsystem commands */ - typedef int (*command_registrant_t)(struct command_context *cmd_ctx); + typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value); static const command_registrant_t command_registrants[] = { &openocd_register_commands, &server_register_commands, @@ -301,31 +270,14 @@ struct command_context *setup_command_handler(Jim_Interp *interp) return cmd_ctx; } -/* 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(). */ -int openocd_main(int argc, char *argv[]) +/** 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; - /* initialize commandline interface */ - struct command_context *cmd_ctx; - - cmd_ctx = setup_command_handler(NULL); - - if (util_init(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - - if (ioutil_init(cmd_ctx) != ERROR_OK) - return EXIT_FAILURE; - - LOG_OUTPUT("For bug reports, read\n\t" - "http://openocd.berlios.de/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; @@ -344,15 +296,44 @@ int openocd_main(int argc, char *argv[]) { ret = command_run_line(cmd_ctx, "init"); if (ERROR_OK != ret) - ret = EXIT_FAILURE; + return EXIT_FAILURE; } - /* handle network connections */ - if (ERROR_OK == ret) - server_loop(cmd_ctx); + 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(). */ +int openocd_main(int argc, char *argv[]) +{ + int ret; + + /* initialize commandline interface */ + struct command_context *cmd_ctx; + + cmd_ctx = setup_command_handler(NULL); + + if (util_init(cmd_ctx) != ERROR_OK) + return EXIT_FAILURE; + + if (ioutil_init(cmd_ctx) != ERROR_OK) + return EXIT_FAILURE; + + LOG_OUTPUT("For bug reports, read\n\t" + "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); + + /* Start the executable meat that can evolve into thread in future. */ + ret = openocd_thread(argc, argv, cmd_ctx); + unregister_all_commands(cmd_ctx, NULL); /* free commandline interface */