diff options
author | Tim Newsome <tim@sifive.com> | 2021-04-13 11:22:43 -0700 |
---|---|---|
committer | Tim Newsome <tim@sifive.com> | 2021-04-13 11:26:25 -0700 |
commit | 7420382a4d9453bf4bf72f2e42728136f9a3b7bb (patch) | |
tree | 4aa04d3b401b9b9da8c29fda93e6ff23a70b29f1 /src/target/arc_cmd.c | |
parent | 05e962e03a9642f883c0a91c38409ba89ad4fa7c (diff) | |
parent | 0f06d943366154963c6f5eb70f52e70f64fe5c71 (diff) | |
download | riscv-openocd-7420382a4d9453bf4bf72f2e42728136f9a3b7bb.zip riscv-openocd-7420382a4d9453bf4bf72f2e42728136f9a3b7bb.tar.gz riscv-openocd-7420382a4d9453bf4bf72f2e42728136f9a3b7bb.tar.bz2 |
Merge branch 'master' into from_upstream
Conflicts:
.github/workflows/snapshot.yml
NEWS
configure.ac
contrib/loaders/checksum/riscv_crc.c
jimtcl
src/helper/time_support.h
src/jtag/drivers/arm-jtag-ew.c
src/rtos/FreeRTOS.c
src/target/image.c
src/target/riscv/riscv.c
Change-Id: I043624ba540d4672fc123dddb2066bcb9c6b5a05
Diffstat (limited to 'src/target/arc_cmd.c')
-rw-r--r-- | src/target/arc_cmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/target/arc_cmd.c b/src/target/arc_cmd.c index 18f5cb8..5c5247b 100644 --- a/src/target/arc_cmd.c +++ b/src/target/arc_cmd.c @@ -382,7 +382,7 @@ static int jim_arc_get_core_reg(Jim_Interp *interp, int argc, Jim_Obj * const *a /* Register number */ JIM_CHECK_RETVAL(arc_cmd_jim_get_uint32(&goi, ®num)); - if (regnum > CORE_REG_MAX_NUMBER || regnum == CORE_R61_NUM || regnum == CORE_R62_NUM) { + if (regnum > CORE_REG_MAX_NUMBER || regnum == ARC_R61 || regnum == ARC_R62) { Jim_SetResultFormatted(goi.interp, "Core register number %i " "is invalid. Must less then 64 and not 61 and 62.", regnum); return JIM_ERR; @@ -425,7 +425,7 @@ static int jim_arc_set_core_reg(Jim_Interp *interp, int argc, Jim_Obj * const *a /* Register number */ JIM_CHECK_RETVAL(arc_cmd_jim_get_uint32(&goi, ®num)); - if (regnum > CORE_REG_MAX_NUMBER || regnum == CORE_R61_NUM || regnum == CORE_R62_NUM) { + if (regnum > CORE_REG_MAX_NUMBER || regnum == ARC_R61 || regnum == ARC_R62) { Jim_SetResultFormatted(goi.interp, "Core register number %i " "is invalid. Must less then 64 and not 61 and 62.", regnum); return JIM_ERR; |