X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=3c96d321456a053d2e6eb35457c64e68061e9fab;hb=fed329feec985b74961f5209c824ba3ca618eea7;hp=2eb7346c5705b036de3329119fcefa946937d104;hpb=28c24a5c41c47a66e9310912f88148814f730a25;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index 2eb7346c57..3c96d32145 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -27,7 +27,7 @@
 #endif
 
 #include "openocd.h"
-#include <jtag/driver.h>
+#include <jtag/adapter.h>
 #include <jtag/jtag.h>
 #include <transport/transport.h>
 #include <helper/util.h>
@@ -234,6 +234,65 @@ 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)
@@ -246,13 +305,14 @@ 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,
 		&log_register_commands,
 		&rtt_server_register_commands,
 		&transport_register_commands,
-		&interface_register_commands,
+		&adapter_register_commands,
 		&target_register_commands,
 		&flash_register_commands,
 		&nand_register_commands,
@@ -262,7 +322,7 @@ static struct command_context *setup_command_handler(Jim_Interp *interp)
 		&arm_tpiu_swo_register_commands,
 		NULL
 	};
-	for (unsigned i = 0; NULL != command_registrants[i]; i++) {
+	for (unsigned i = 0; command_registrants[i]; i++) {
 		int retval = (*command_registrants[i])(cmd_ctx);
 		if (retval != ERROR_OK) {
 			command_done(cmd_ctx);
@@ -364,8 +424,8 @@ int openocd_main(int argc, char *argv[])
 	help_del_all_commands(cmd_ctx);
 
 	/* free all DAP and CTI objects */
-	dap_cleanup_all();
 	arm_cti_cleanup_all();
+	dap_cleanup_all();
 
 	adapter_quit();
 
@@ -377,6 +437,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)