diff options
| author | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2025-02-17 15:39:30 +0300 |
|---|---|---|
| committer | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2025-03-14 12:43:56 +0300 |
| commit | ece1827613d527d95aced1a1952e92ee86af56f9 (patch) | |
| tree | c23038232bc6d477512d059b79d0100dbe8532c4 /src | |
| parent | 41a225460c3b9a6c1f61a0777f101ff009f56007 (diff) | |
| download | riscv-openocd-ece1827613d527d95aced1a1952e92ee86af56f9.zip riscv-openocd-ece1827613d527d95aced1a1952e92ee86af56f9.tar.gz riscv-openocd-ece1827613d527d95aced1a1952e92ee86af56f9.tar.bz2 | |
target/riscv: avoid `config` modification on `jim_getopt_obj()` failure
Currently, `jim_getopt_obj()` only fails if `goi->argc` is zero,
Link: https://github.com/riscv-collab/riscv-openocd/blob/41a225460c3b9a6c1f61a0777f101ff009f56007/src/helper/jim-nvp.c#L174-L185
so the check at the start of `jim_configure_ebreak()`
Link: https://github.com/riscv-collab/riscv-openocd/blob/41a225460c3b9a6c1f61a0777f101ff009f56007/src/target/riscv/riscv.c#L526-L530
guarantees that the call will succeed.
However, the modification makes the code more robust and future-proof.
Change-Id: Ic8c2e057a285bf679d26e21bda138a1d2ae5d5ce
Signed-off-by: Evgeniy Naydanov <evgeniy.naydanov@syntacore.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/target/riscv/riscv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c index c555b4c..cd31881 100644 --- a/src/target/riscv/riscv.c +++ b/src/target/riscv/riscv.c @@ -534,9 +534,12 @@ static int jim_configure_ebreak(struct riscv_private_config *config, struct jim_ /* Here a common "ebreak" action is processed, e.g: * "riscv.cpu configure -ebreak halt" */ + int res = jim_getopt_obj(goi, NULL); + if (res != JIM_OK) + return res; for (int ebreak_ctl_i = 0; ebreak_ctl_i < N_RISCV_MODE; ++ebreak_ctl_i) config->dcsr_ebreak_fields[ebreak_ctl_i] = common_mode_nvp->value; - return jim_getopt_obj(goi, NULL); + return JIM_OK; } /* Here a "ebreak" action for a specific execution mode is processed, e.g: |