[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-66-gda76ba610

[openocd-gerrit <ope...@us...>]

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  da76ba610b8e6b05de3a837926d06f8e7d964b97 (commit)
       via  996d6f383dfcffbc4550daedb622d3d006e8cd37 (commit)
      from  f0cb5b027238f6beb0bee80a9d385716923ae6eb (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 da76ba610b8e6b05de3a837926d06f8e7d964b97
Author: Antonio Borneo <bor...@gm...>
Date:   Mon Dec 19 17:14:15 2022 +0100

    target: arc: rewrite command 'arc num-actionpoints' as COMMAND_HANDLER
    
    Also drop arc_cmd_jim_get_uint32() that is now unused.
    
    Change-Id: Ic26c3f008376db3f01215bf736fca736dd1c1a4f
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7412
    Tested-by: jenkins
    Reviewed-by: Evgeniy Didin <di...@sy...>

diff --git a/src/target/arc_cmd.c b/src/target/arc_cmd.c
index 264adc0b5..e7c54446e 100644
--- a/src/target/arc_cmd.c
+++ b/src/target/arc_cmd.c
@@ -22,14 +22,6 @@
  * ------------------------------------------------------------------------- */
 
 
-static int arc_cmd_jim_get_uint32(struct jim_getopt_info *goi, uint32_t *value)
-{
-	jim_wide value_wide;
-	JIM_CHECK_RETVAL(jim_getopt_wide(goi, &value_wide));
-	*value = (uint32_t)value_wide;
-	return JIM_OK;
-}
-
 enum add_reg_types {
 	CFG_ADD_REG_TYPE_FLAG,
 	CFG_ADD_REG_TYPE_STRUCT,
@@ -863,27 +855,17 @@ COMMAND_HANDLER(arc_l2_cache_disable_auto_cmd)
 		&arc->has_l2cache, "target has l2 cache enabled");
 }
 
-static int jim_handle_actionpoints_num(Jim_Interp *interp, int argc,
-	Jim_Obj * const *argv)
+COMMAND_HANDLER(arc_handle_actionpoints_num)
 {
-	struct jim_getopt_info goi;
-	jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
-
 	LOG_DEBUG("-");
 
-	if (goi.argc >= 2) {
-		Jim_WrongNumArgs(interp, goi.argc, goi.argv, "[<unsigned integer>]");
-		return JIM_ERR;
-	}
-
-	struct command_context *context = current_command_context(interp);
-	assert(context);
-
-	struct target *target = get_current_target(context);
+	if (CMD_ARGC >= 2)
+		return ERROR_COMMAND_SYNTAX_ERROR;
 
+	struct target *target = get_current_target(CMD_CTX);
 	if (!target) {
-		Jim_SetResultFormatted(goi.interp, "No current target");
-		return JIM_ERR;
+		command_print(CMD, "No current target");
+		return ERROR_FAIL;
 	}
 
 	struct arc_common *arc = target_to_arc(target);
@@ -892,19 +874,19 @@ static int jim_handle_actionpoints_num(Jim_Interp *interp, int argc,
 	 * "actionpoint reset, initiated by arc_set_actionpoints_num.  */
 	uint32_t ap_num = arc->actionpoints_num;
 
-	if (goi.argc == 1) {
-		JIM_CHECK_RETVAL(arc_cmd_jim_get_uint32(&goi, &ap_num));
+	if (CMD_ARGC == 1) {
+		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], ap_num);
 		int e = arc_set_actionpoints_num(target, ap_num);
 		if (e != ERROR_OK) {
-			Jim_SetResultFormatted(goi.interp,
+			command_print(CMD,
 				"Failed to set number of actionpoints");
-			return JIM_ERR;
+			return e;
 		}
 	}
 
-	Jim_SetResultInt(interp, ap_num);
+	command_print(CMD, "%" PRIu32, ap_num);
 
-	return JIM_OK;
+	return ERROR_OK;
 }
 
 /* ----- Exported target commands ------------------------------------------ */
@@ -1004,7 +986,7 @@ static const struct command_registration arc_core_command_handlers[] = {
 	},
 	{
 		.name = "num-actionpoints",
-		.jim_handler = jim_handle_actionpoints_num,
+		.handler = arc_handle_actionpoints_num,
 		.mode = COMMAND_ANY,
 		.usage = "[<unsigned integer>]",
 		.help = "Prints or sets amount of actionpoints in the processor.",

commit 996d6f383dfcffbc4550daedb622d3d006e8cd37
Author: Antonio Borneo <bor...@gm...>
Date:   Mon Dec 19 17:03:03 2022 +0100

    target: arc: rewrite command 'arc get-reg-field' as COMMAND_HANDLER
    
    This also fixes several incorrect return ERROR_xxx from a jim
    command.
    
    Change-Id: I34fe3552d3dc344eac67bf504c5d5709b707fdfd
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7411
    Tested-by: jenkins
    Reviewed-by: Evgeniy Didin <di...@sy...>

diff --git a/src/target/arc_cmd.c b/src/target/arc_cmd.c
index 34ddc6903..264adc0b5 100644
--- a/src/target/arc_cmd.c
+++ b/src/target/arc_cmd.c
@@ -796,59 +796,40 @@ COMMAND_HANDLER(arc_set_reg_exists)
 
 /* arc reg-field  ($reg_name) ($reg_field)
  * Reads struct type register field */
-static int jim_arc_get_reg_field(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
+COMMAND_HANDLER(arc_handle_get_reg_field)
 {
-	struct jim_getopt_info goi;
-	const char *reg_name, *field_name;
-	uint32_t value;
-	int retval;
-
-	JIM_CHECK_RETVAL(jim_getopt_setup(&goi, interp, argc-1, argv+1));
-
-	LOG_DEBUG("Reading register field");
-	if (goi.argc != 2) {
-		if (!goi.argc)
-			Jim_WrongNumArgs(interp, goi.argc, goi.argv, "<regname> <fieldname>");
-		else if (goi.argc == 1)
-			Jim_WrongNumArgs(interp, goi.argc, goi.argv, "<fieldname>");
-		else
-			Jim_WrongNumArgs(interp, goi.argc, goi.argv, "<regname> <fieldname>");
+	if (CMD_ARGC != 2)
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
-
-	JIM_CHECK_RETVAL(jim_getopt_string(&goi, &reg_name, NULL));
-	JIM_CHECK_RETVAL(jim_getopt_string(&goi, &field_name, NULL));
-	assert(reg_name);
-	assert(field_name);
 
-	struct command_context * const ctx = current_command_context(interp);
-	assert(ctx);
-	struct target * const target = get_current_target(ctx);
+	struct target *target = get_current_target(CMD_CTX);
 	if (!target) {
-		Jim_SetResultFormatted(goi.interp, "No current target");
-		return JIM_ERR;
+		command_print(CMD, "No current target");
+		return ERROR_FAIL;
 	}
 
-	retval = arc_reg_get_field(target, reg_name, field_name, &value);
+	const char *reg_name = CMD_ARGV[0];
+	const char *field_name = CMD_ARGV[1];
+	uint32_t value;
+	int retval = arc_reg_get_field(target, reg_name, field_name, &value);
 
 	switch (retval) {
 		case ERROR_OK:
 			break;
 		case ERROR_ARC_REGISTER_NOT_FOUND:
-			Jim_SetResultFormatted(goi.interp,
+			command_print(CMD,
 				"Register `%s' has not been found.", reg_name);
 			return ERROR_COMMAND_ARGUMENT_INVALID;
 		case ERROR_ARC_REGISTER_IS_NOT_STRUCT:
-			Jim_SetResultFormatted(goi.interp,
+			command_print(CMD,
 				"Register `%s' must have 'struct' type.", reg_name);
 			return ERROR_COMMAND_ARGUMENT_INVALID;
 		case ERROR_ARC_REGISTER_FIELD_NOT_FOUND:
-			Jim_SetResultFormatted(goi.interp,
+			command_print(CMD,
 				"Field `%s' has not been found in register `%s'.",
 				field_name, reg_name);
 			return ERROR_COMMAND_ARGUMENT_INVALID;
 		case ERROR_ARC_FIELD_IS_NOT_BITFIELD:
-			Jim_SetResultFormatted(goi.interp,
+			command_print(CMD,
 				"Field `%s' is not a 'bitfield' field in a structure.",
 				field_name);
 			return ERROR_COMMAND_ARGUMENT_INVALID;
@@ -857,9 +838,9 @@ static int jim_arc_get_reg_field(Jim_Interp *interp, int argc, Jim_Obj * const *
 			return retval;
 	}
 
-	Jim_SetResultInt(interp, value);
+	command_print(CMD, "0x%" PRIx32, value);
 
-	return JIM_OK;
+	return ERROR_OK;
 }
 
 COMMAND_HANDLER(arc_l1_cache_disable_auto_cmd)
@@ -1002,7 +983,7 @@ static const struct command_registration arc_core_command_handlers[] = {
 	},
 	{
 		.name = "get-reg-field",
-		.jim_handler = jim_arc_get_reg_field,
+		.handler = arc_handle_get_reg_field,
 		.mode = COMMAND_ANY,
 		.usage = "<regname> <field_name>",
 		.help = "Returns value of field in a register with 'struct' type.",

-----------------------------------------------------------------------

Summary of changes:
 src/target/arc_cmd.c | 95 ++++++++++++++++------------------------------------
 1 file changed, 29 insertions(+), 66 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository