interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

target/mips: Remove 'ERROR: ' prefix in error log 

Remove the prefix since it is redundant.

Change-Id: Ieecfb3583d484847514f1298e819ccf6d26abd84
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: https://review.openocd.org/c/openocd/+/8632
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Marc Schink 2024-11-30 15:34:20 +01:00 committed by Antonio Borneo
parent 9cd0b37112
commit 3be1bee753
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/target/mips32_pracc.c
View File

@ -400,7 +400,7 @@ int mips32_pracc_queue_exec(struct mips_ejtag *ejtag_info, struct pracc_queue_in
ejtag_ctrl = buf_get_u32(scan_in[scan_count].scan_32.ctrl, 0, 32); ejtag_ctrl = buf_get_u32(scan_in[scan_count].scan_32.ctrl, 0, 32);
uint32_t addr = buf_get_u32(scan_in[scan_count].scan_32.addr, 0, 32); uint32_t addr = buf_get_u32(scan_in[scan_count].scan_32.addr, 0, 32);
if (!(ejtag_ctrl & EJTAG_CTRL_PRACC)) { if (!(ejtag_ctrl & EJTAG_CTRL_PRACC)) {
LOG_ERROR("Error: access not pending count: %d", scan_count); LOG_ERROR("Access not pending, count: %d", scan_count);
retval = ERROR_FAIL; retval = ERROR_FAIL;
goto exit; goto exit;
} }

12
src/target/mips64_pracc.c
View File

@ -76,12 +76,12 @@ static int mips64_pracc_exec_read(struct mips64_pracc_context *ctx, uint64_t add
offset = (address - MIPS64_PRACC_PARAM_IN) / MIPS64_PRACC_DATA_STEP; offset = (address - MIPS64_PRACC_PARAM_IN) / MIPS64_PRACC_DATA_STEP;
if (offset >= MIPS64_PRACC_PARAM_IN_SIZE) { if (offset >= MIPS64_PRACC_PARAM_IN_SIZE) {
LOG_ERROR("Error: iparam size exceeds MIPS64_PRACC_PARAM_IN_SIZE"); LOG_ERROR("iparam size exceeds MIPS64_PRACC_PARAM_IN_SIZE");
return ERROR_JTAG_DEVICE_ERROR; return ERROR_JTAG_DEVICE_ERROR;
} }
if (!ctx->local_iparam) { if (!ctx->local_iparam) {
LOG_ERROR("Error: unexpected reading of input parameter"); LOG_ERROR("unexpected reading of input parameter");
return ERROR_JTAG_DEVICE_ERROR; return ERROR_JTAG_DEVICE_ERROR;
} }
@ -93,7 +93,7 @@ static int mips64_pracc_exec_read(struct mips64_pracc_context *ctx, uint64_t add
offset = (address - MIPS64_PRACC_PARAM_OUT) / MIPS64_PRACC_DATA_STEP; offset = (address - MIPS64_PRACC_PARAM_OUT) / MIPS64_PRACC_DATA_STEP;
if (!ctx->local_oparam) { if (!ctx->local_oparam) {
LOG_ERROR("Error: unexpected reading of output parameter"); LOG_ERROR("unexpected reading of output parameter");
return ERROR_JTAG_DEVICE_ERROR; return ERROR_JTAG_DEVICE_ERROR;
} }
@ -181,7 +181,7 @@ static int mips64_pracc_exec_write(struct mips64_pracc_context *ctx, uint64_t ad
&& (address < MIPS64_PRACC_PARAM_IN + ctx->num_iparam * MIPS64_PRACC_DATA_STEP)) { && (address < MIPS64_PRACC_PARAM_IN + ctx->num_iparam * MIPS64_PRACC_DATA_STEP)) {
offset = (address - MIPS64_PRACC_PARAM_IN) / MIPS64_PRACC_DATA_STEP; offset = (address - MIPS64_PRACC_PARAM_IN) / MIPS64_PRACC_DATA_STEP;
if (!ctx->local_iparam) { if (!ctx->local_iparam) {
LOG_ERROR("Error: unexpected writing of input parameter"); LOG_ERROR("unexpected writing of input parameter");
return ERROR_JTAG_DEVICE_ERROR; return ERROR_JTAG_DEVICE_ERROR;
} }
ctx->local_iparam[offset] = data; ctx->local_iparam[offset] = data;
@ -189,14 +189,14 @@ static int mips64_pracc_exec_write(struct mips64_pracc_context *ctx, uint64_t ad
&& (address < MIPS64_PRACC_PARAM_OUT + ctx->num_oparam * MIPS64_PRACC_DATA_STEP)) { && (address < MIPS64_PRACC_PARAM_OUT + ctx->num_oparam * MIPS64_PRACC_DATA_STEP)) {
offset = (address - MIPS64_PRACC_PARAM_OUT) / MIPS64_PRACC_DATA_STEP; offset = (address - MIPS64_PRACC_PARAM_OUT) / MIPS64_PRACC_DATA_STEP;
if (!ctx->local_oparam) { if (!ctx->local_oparam) {
LOG_ERROR("Error: unexpected writing of output parameter"); LOG_ERROR("unexpected writing of output parameter");
return ERROR_JTAG_DEVICE_ERROR; return ERROR_JTAG_DEVICE_ERROR;
} }
ctx->local_oparam[offset] = data; ctx->local_oparam[offset] = data;
} else if (address == MIPS64_PRACC_STACK) { } else if (address == MIPS64_PRACC_STACK) {
/* save data onto our stack */ /* save data onto our stack */
if (ctx->stack_offset >= STACK_DEPTH) { if (ctx->stack_offset >= STACK_DEPTH) {
LOG_ERROR("Error: PrAcc stack depth exceeded"); LOG_ERROR("PrAcc stack depth exceeded");
return ERROR_FAIL; return ERROR_FAIL;
} }
ctx->stack[ctx->stack_offset++] = data; ctx->stack[ctx->stack_offset++] = data;