[PATCH]: c98954f893 jimtcl: anticipate possible change in jimtcl

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/8956

-- gerrit

commit c98954f893d2d608f0b3dd041862c1717d116b9c
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Sep 28 17:58:51 2024 +0200

    jimtcl: anticipate possible change in jimtcl
    
    Current jimtcl release 0.83 has been tagged on 2024-08-28 and the
    new 0.84 is on the way.
    
    A new change [1] in jimtcl branch 'master-next', potentially to be
    merged in 0.85, breaks the build of OpenOCD.
    OpenOCD releases are not frequent and jimtcl is now by default an
    external build dependency. The change [1], once gets merged, would
    force OpenOCD to deliver a fix release to support it.
    
    Anticipate the change [1] by detecting it at compile time, without
    relying on jimtcl version, and providing an alternative code.
    
    Link: https://github.com/msteveb/jimtcl/commit/b09e50834824 [1]
    Change-Id: I61bf100d447083258aea222aaf15608b7cbe2e57
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/helper/command.c b/src/helper/command.c
index b70081a4dd..04f4f9a54c 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -45,17 +45,22 @@ static enum command_mode get_command_mode(Jim_Interp *interp, const char *cmd_na
 /* set of functions to wrap jimtcl internal data */
 static inline bool jimcmd_is_proc(Jim_Cmd *cmd)
 {
+#if defined(JIM_CMD_ISPROC)
+	// JIM_VERSION >= 84
+	return cmd->flags & JIM_CMD_ISPROC;
+#else
 	return cmd->isproc;
+#endif
 }
 
 bool jimcmd_is_oocd_command(Jim_Cmd *cmd)
 {
-	return !cmd->isproc && cmd->u.native.cmdProc == jim_command_dispatch;
+	return !jimcmd_is_proc(cmd) && cmd->u.native.cmdProc == jim_command_dispatch;
 }
 
 void *jimcmd_privdata(Jim_Cmd *cmd)
 {
-	return cmd->isproc ? NULL : cmd->u.native.privData;
+	return jimcmd_is_proc(cmd) ? NULL : cmd->u.native.privData;
 }
 
 static int command_retval_set(Jim_Interp *interp, int retval)

--