aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Schink <dev@zapb.de>2022-04-23 13:13:06 +0200
committerAntonio Borneo <borneo.antonio@gmail.com>2022-04-30 17:52:40 +0000
commit8789513fa94ff54f08eaffedce0cc6c38f44311d (patch)
tree36360f4396399ba84f82aa30b98529ca2797a97c
parent9eddc21a585a813d7675d9d4ad07c5d8c97dee9b (diff)
downloadriscv-openocd-8789513fa94ff54f08eaffedce0cc6c38f44311d.zip
riscv-openocd-8789513fa94ff54f08eaffedce0cc6c38f44311d.tar.gz
riscv-openocd-8789513fa94ff54f08eaffedce0cc6c38f44311d.tar.bz2
target/arm_cti: Fix error handling in 'cti create'
Handle JIM_CONTINUE return value of adiv5_jim_mem_ap_spot_configure(), otherwise OpenOCD silently quits when an unknown option is provided. Change-Id: I9b1351c0911e74999d8dd1260ede9760088510d7 Signed-off-by: Marc Schink <dev@zapb.de> Reviewed-on: https://review.openocd.org/c/openocd/+/6944 Tested-by: jenkins Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
-rw-r--r--src/target/arm_cti.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/target/arm_cti.c b/src/target/arm_cti.c
index c776e9c..96927bf 100644
--- a/src/target/arm_cti.c
+++ b/src/target/arm_cti.c
@@ -435,8 +435,13 @@ static int cti_configure(struct jim_getopt_info *goi, struct arm_cti *cti)
/* parse config or cget options ... */
while (goi->argc > 0) {
int e = adiv5_jim_mem_ap_spot_configure(&cti->spot, goi);
+
+ if (e == JIM_CONTINUE)
+ Jim_SetResultFormatted(goi->interp, "unknown option '%s'",
+ Jim_String(goi->argv[0]));
+
if (e != JIM_OK)
- return e;
+ return JIM_ERR;
}
if (!cti->spot.dap) {