X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=83c35458b9ae89a1ad962f25ded32731a3b00de1;hp=0292ba445b28f89559e565fe276673c3b9273f74;hb=HEAD;hpb=ac1a632ba13efa77393cecf29bd29410db60cada diff --git a/src/openocd.c b/src/openocd.c index 0292ba445b..54c5eb34f7 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + /*************************************************************************** * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * @@ -7,19 +9,6 @@ * * * Copyright (C) 2008 Richard Missenden * * richard.missenden@googlemail.com * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -62,24 +51,23 @@ static const char openocd_startup_tcl[] = { }; /* 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) +COMMAND_HANDLER(handler_version_command) { - if (argc > 2) - return JIM_ERR; - const char *str = ""; - char *version_str; - version_str = OPENOCD_VERSION; + char *version_str = OPENOCD_VERSION; - if (argc == 2) - str = Jim_GetString(argv[1], NULL); + if (CMD_ARGC > 1) + return ERROR_COMMAND_SYNTAX_ERROR; + + if (CMD_ARGC == 1) { + if (strcmp("git", CMD_ARGV[0])) + return ERROR_COMMAND_ARGUMENT_INVALID; - if (strcmp("git", str) == 0) version_str = GITVERSION; + } - Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1)); + command_print(CMD, "%s", version_str); - return JIM_OK; + return ERROR_OK; } static int log_target_callback_event_handler(struct target *target, @@ -130,6 +118,8 @@ COMMAND_HANDLER(handle_init_command) initialized = 1; + bool save_poll_mask = jtag_poll_mask(); + retval = command_run_line(CMD_CTX, "target init"); if (retval != ERROR_OK) return ERROR_FAIL; @@ -177,11 +167,16 @@ COMMAND_HANDLER(handle_init_command) if (command_run_line(CMD_CTX, "tpiu init") != ERROR_OK) return ERROR_FAIL; + jtag_poll_unmask(save_poll_mask); + /* initialize telnet subsystem */ gdb_target_add_all(all_targets); target_register_event_callback(log_target_callback_event_handler, CMD_CTX); + if (command_run_line(CMD_CTX, "_run_post_init_commands") != ERROR_OK) + return ERROR_FAIL; + return ERROR_OK; } @@ -198,9 +193,10 @@ COMMAND_HANDLER(handle_add_script_search_dir_command) static const struct command_registration openocd_command_handlers[] = { { .name = "version", - .jim_handler = jim_version_command, + .handler = handler_version_command, .mode = COMMAND_ANY, .help = "show program version", + .usage = "[git]", }, { .name = "noinit", @@ -234,65 +230,6 @@ static int openocd_register_commands(struct command_context *cmd_ctx) return register_commands(cmd_ctx, NULL, openocd_command_handlers); } -/* - * TODO: to be removed after v0.12.0 - * workaround for syntax change of "expr" in jimtcl 0.81 - * replace "expr" with openocd version that prints the deprecated msg - */ -struct jim_scriptobj { - void *token; - Jim_Obj *filename_obj; - int len; - int subst_flags; - int in_use; - int firstline; - int linenr; - int missing; -}; - -static int jim_expr_command(Jim_Interp *interp, int argc, Jim_Obj * const *argv) -{ - if (argc == 2) - return Jim_EvalExpression(interp, argv[1]); - - if (argc > 2) { - Jim_Obj *obj = Jim_ConcatObj(interp, argc - 1, argv + 1); - Jim_IncrRefCount(obj); - const char *s = Jim_String(obj); - struct jim_scriptobj *script = Jim_GetIntRepPtr(interp->currentScriptObj); - if (interp->currentScriptObj == interp->emptyObj || - strcmp(interp->currentScriptObj->typePtr->name, "script") || - script->subst_flags || - script->filename_obj == interp->emptyObj) - LOG_WARNING("DEPRECATED! use 'expr { %s }' not 'expr %s'", s, s); - else - LOG_WARNING("DEPRECATED! (%s:%d) use 'expr { %s }' not 'expr %s'", - Jim_String(script->filename_obj), script->linenr, s, s); - int retcode = Jim_EvalExpression(interp, obj); - Jim_DecrRefCount(interp, obj); - return retcode; - } - - Jim_WrongNumArgs(interp, 1, argv, "expression ?...?"); - return JIM_ERR; -} - -static const struct command_registration expr_handler[] = { - { - .name = "expr", - .jim_handler = jim_expr_command, - .mode = COMMAND_ANY, - .help = "", - .usage = "", - }, - COMMAND_REGISTRATION_DONE -}; - -static int workaround_for_jimtcl_expr(struct command_context *cmd_ctx) -{ - return register_commands(cmd_ctx, NULL, expr_handler); -} - struct command_context *global_cmd_ctx; static struct command_context *setup_command_handler(Jim_Interp *interp) @@ -305,7 +242,6 @@ static struct command_context *setup_command_handler(Jim_Interp *interp) /* register subsystem commands */ typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value); static const command_registrant_t command_registrants[] = { - &workaround_for_jimtcl_expr, &openocd_register_commands, &server_register_commands, &gdb_register_commands, @@ -437,6 +373,8 @@ int openocd_main(int argc, char *argv[]) rtt_exit(); free_config(); + log_exit(); + if (ret == ERROR_FAIL) return EXIT_FAILURE; else if (ret != ERROR_OK)