aboutsummaryrefslogtreecommitdiff
path: root/src/helper/command.c
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2022-12-18 19:15:57 +0100
committerAntonio Borneo <borneo.antonio@gmail.com>2023-01-15 14:46:57 +0000
commit95603fae18f81eebdafc5b318e70f9e2cdefab9e (patch)
tree60351b952ace8cd71fc5aa14a79fd803842ccf6d /src/helper/command.c
parentda34e36cdb542eac9370957b10853184f870e495 (diff)
downloadriscv-openocd-95603fae18f81eebdafc5b318e70f9e2cdefab9e.zip
riscv-openocd-95603fae18f81eebdafc5b318e70f9e2cdefab9e.tar.gz
riscv-openocd-95603fae18f81eebdafc5b318e70f9e2cdefab9e.tar.bz2
openocd: revert workarounds for 'expr' syntax change
With OpenOCD v0.12.0 released, drop the workarounds for 'expr' syntax change by reverting: - commit 320043c054dc ("openocd: fix for polling during "expr" computation"); - commit c7eaaf620488 ("openocd: prepare for jimtcl 0.81 'expr' syntax change"). Replace the call to target_call_timer_callbacks_now() with call to target_call_timer_callbacks(). Change-Id: Iae5afc50e3f688e11176a52648efc9a6577a9a11 Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-on: https://review.openocd.org/c/openocd/+/7405 Tested-by: jenkins
Diffstat (limited to 'src/helper/command.c')
-rw-r--r--src/helper/command.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/helper/command.c b/src/helper/command.c
index 6898e2d..ca66cf7 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -936,19 +936,7 @@ static int jim_command_dispatch(Jim_Interp *interp, int argc, Jim_Obj * const *a
if (!command_can_run(cmd_ctx, c, Jim_GetString(argv[0], NULL)))
return JIM_ERR;
- /*
- * TODO: to be removed after v0.12.0
- * workaround for https://sourceforge.net/p/openocd/tickets/362/
- * After syntax change of "expr" in jimtcl 0.81
- * the replacement of jimtcl "expr" with openocd version in
- * https://review.openocd.org/6510/
- * introduces too many target polling during math expressions with
- * "expr" commands.
- * After v0.12.0 replace the following two lines with
- * target_call_timer_callbacks();
- */
- if (strcmp(c->name, "expr"))
- target_call_timer_callbacks_now();
+ target_call_timer_callbacks();
/*
* Black magic of overridden current target: