Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-1001-ge9c78512b
|
From: openocd-gerrit <ope...@us...> - 2025-05-25 12:42:30
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via e9c78512b30b13fc6a9714e3fad0074bc2387bb5 (commit)
via 114385280ae59fa0788b0077ba6d9596660cc714 (commit)
from c8979f6441eb62bb261827daa252c4e5596c4a39 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e9c78512b30b13fc6a9714e3fad0074bc2387bb5
Author: Antonio Borneo <bor...@gm...>
Date: Sat Dec 16 17:29:43 2023 +0100
target/arm_tpiu_swo: rewrite commands 'configure' and 'cget' as COMMAND_HANDLER
Rewrite only the command, but still use the old jimtcl specific
code in arm_tpiu_swo_configure(), shared with command 'create'.
Change-Id: If2258f048403f54faf229e602d9b395b71894f97
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8900
Tested-by: jenkins
diff --git a/src/target/arm_tpiu_swo.c b/src/target/arm_tpiu_swo.c
index f2cb1a0fd..afdd8ce91 100644
--- a/src/target/arm_tpiu_swo.c
+++ b/src/target/arm_tpiu_swo.c
@@ -554,20 +554,28 @@ err_no_params:
return JIM_ERR;
}
-static int jim_arm_tpiu_swo_configure(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
+COMMAND_HANDLER(handle_arm_tpiu_swo_configure)
{
- struct command *c = jim_to_command(interp);
+ struct arm_tpiu_swo_object *obj = CMD_DATA;
+
+ if (!CMD_ARGC)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
struct jim_getopt_info goi;
+ jim_getopt_setup(&goi, CMD_CTX->interp, CMD_ARGC, CMD_JIMTCL_ARGV);
+ goi.is_configure = !strcmp(CMD_NAME, "configure");
- jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
- goi.is_configure = !strcmp(c->name, "configure");
- if (goi.argc < 1) {
- Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv,
- "missing: -option ...");
- return JIM_ERR;
- }
- struct arm_tpiu_swo_object *obj = c->jim_handler_data;
- return arm_tpiu_swo_configure(&goi, obj);
+ int e = arm_tpiu_swo_configure(&goi, obj);
+
+ int reslen;
+ const char *result = Jim_GetString(Jim_GetResult(CMD_CTX->interp), &reslen);
+ if (reslen > 0)
+ command_print(CMD, "%s", result);
+
+ if (e != JIM_OK)
+ return ERROR_FAIL;
+
+ return ERROR_OK;
}
static int wrap_write_u32(struct target *target, struct adiv5_ap *tpiu_ap,
@@ -872,14 +880,14 @@ static const struct command_registration arm_tpiu_swo_instance_command_handlers[
{
.name = "configure",
.mode = COMMAND_ANY,
- .jim_handler = jim_arm_tpiu_swo_configure,
+ .handler = handle_arm_tpiu_swo_configure,
.help = "configure a new TPIU/SWO for use",
.usage = "[attribute value ...]",
},
{
.name = "cget",
.mode = COMMAND_ANY,
- .jim_handler = jim_arm_tpiu_swo_configure,
+ .handler = handle_arm_tpiu_swo_configure,
.help = "returns the specified TPIU/SWO attribute",
.usage = "attribute",
},
commit 114385280ae59fa0788b0077ba6d9596660cc714
Author: Antonio Borneo <bor...@gm...>
Date: Sun May 26 12:34:58 2024 +0200
target/arm_tpiu_swo: rewrite command 'swo create' as COMMAND_HANDLER
Rewrite only the command, but still use the old jimtcl specific
code in arm_tpiu_swo_configure(), shared with commands 'configure'
and 'cget'.
Change-Id: I39c69b1cdc23f7b5f875df3e15be987c715b0bcf
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8899
Tested-by: jenkins
diff --git a/src/target/arm_tpiu_swo.c b/src/target/arm_tpiu_swo.c
index e20cd5927..f2cb1a0fd 100644
--- a/src/target/arm_tpiu_swo.c
+++ b/src/target/arm_tpiu_swo.c
@@ -907,56 +907,25 @@ static const struct command_registration arm_tpiu_swo_instance_command_handlers[
COMMAND_REGISTRATION_DONE
};
-static int arm_tpiu_swo_create(Jim_Interp *interp, struct arm_tpiu_swo_object *obj)
+COMMAND_HANDLER(handle_arm_tpiu_swo_create)
{
- struct command_context *cmd_ctx;
- Jim_Cmd *cmd;
- int e;
+ int retval = ERROR_FAIL;
- cmd_ctx = current_command_context(interp);
- assert(cmd_ctx);
+ if (!CMD_ARGC)
+ return ERROR_COMMAND_SYNTAX_ERROR;
/* does this command exist? */
- cmd = Jim_GetCommand(interp, Jim_NewStringObj(interp, obj->name, -1), JIM_NONE);
- if (cmd) {
- Jim_SetResultFormatted(interp, "cannot create TPIU object because a command with name '%s' already exists",
- obj->name);
- return JIM_ERR;
- }
-
- /* now - create the new tpiu/swo name command */
- const struct command_registration obj_commands[] = {
- {
- .name = obj->name,
- .mode = COMMAND_ANY,
- .help = "tpiu/swo instance command group",
- .usage = "",
- .chain = arm_tpiu_swo_instance_command_handlers,
- },
- COMMAND_REGISTRATION_DONE
- };
- e = register_commands_with_data(cmd_ctx, NULL, obj_commands, obj);
- if (e != ERROR_OK)
- return JIM_ERR;
-
- list_add_tail(&obj->lh, &all_tpiu_swo);
-
- return JIM_OK;
-}
-
-static int jim_arm_tpiu_swo_create(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
-{
- struct jim_getopt_info goi;
- jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
- if (goi.argc < 1) {
- Jim_WrongNumArgs(interp, 1, argv, "name ?option option ...?");
- return JIM_ERR;
+ Jim_Cmd *jimcmd = Jim_GetCommand(CMD_CTX->interp, CMD_JIMTCL_ARGV[0], JIM_NONE);
+ if (jimcmd) {
+ command_print(CMD, "cannot create TPIU object because a command with name '%s' already exists",
+ CMD_ARGV[0]);
+ return ERROR_FAIL;
}
struct arm_tpiu_swo_object *obj = calloc(1, sizeof(struct arm_tpiu_swo_object));
if (!obj) {
LOG_ERROR("Out of memory");
- return JIM_ERR;
+ return ERROR_FAIL;
}
INIT_LIST_HEAD(&obj->connections);
adiv5_mem_ap_spot_init(&obj->spot);
@@ -968,36 +937,55 @@ static int jim_arm_tpiu_swo_create(Jim_Interp *interp, int argc, Jim_Obj *const
goto err_exit;
}
- Jim_Obj *n;
- jim_getopt_obj(&goi, &n);
- obj->name = strdup(Jim_GetString(n, NULL));
+ obj->name = strdup(CMD_ARGV[0]);
if (!obj->name) {
LOG_ERROR("Out of memory");
goto err_exit;
}
/* Do the rest as "configure" options */
- goi.is_configure = true;
+ struct jim_getopt_info goi;
+ jim_getopt_setup(&goi, CMD_CTX->interp, CMD_ARGC - 1, CMD_JIMTCL_ARGV + 1);
+ goi.is_configure = 1;
int e = arm_tpiu_swo_configure(&goi, obj);
+
+ int reslen;
+ const char *result = Jim_GetString(Jim_GetResult(CMD_CTX->interp), &reslen);
+ if (reslen > 0)
+ command_print(CMD, "%s", result);
+
if (e != JIM_OK)
goto err_exit;
if (!obj->spot.dap || obj->spot.ap_num == DP_APSEL_INVALID) {
- Jim_SetResultString(goi.interp, "-dap and -ap-num required when creating TPIU", -1);
+ command_print(CMD, "-dap and -ap-num required when creating TPIU");
goto err_exit;
}
- e = arm_tpiu_swo_create(goi.interp, obj);
- if (e != JIM_OK)
+ /* now - create the new tpiu/swo name command */
+ const struct command_registration obj_commands[] = {
+ {
+ .name = obj->name,
+ .mode = COMMAND_ANY,
+ .help = "tpiu/swo instance command group",
+ .usage = "",
+ .chain = arm_tpiu_swo_instance_command_handlers,
+ },
+ COMMAND_REGISTRATION_DONE
+ };
+ retval = register_commands_with_data(CMD_CTX, NULL, obj_commands, obj);
+ if (retval != ERROR_OK)
goto err_exit;
- return JIM_OK;
+ list_add_tail(&obj->lh, &all_tpiu_swo);
+
+ return ERROR_OK;
err_exit:
free(obj->name);
free(obj->out_filename);
free(obj);
- return JIM_ERR;
+ return retval;
}
COMMAND_HANDLER(handle_arm_tpiu_swo_names)
@@ -1192,7 +1180,7 @@ static const struct command_registration arm_tpiu_swo_subcommand_handlers[] = {
{
.name = "create",
.mode = COMMAND_ANY,
- .jim_handler = jim_arm_tpiu_swo_create,
+ .handler = handle_arm_tpiu_swo_create,
.usage = "name [-dap dap] [-ap-num num] [-baseaddr baseaddr]",
.help = "Creates a new TPIU or SWO object",
},
-----------------------------------------------------------------------
Summary of changes:
src/target/arm_tpiu_swo.c | 124 ++++++++++++++++++++++------------------------
1 file changed, 60 insertions(+), 64 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
