[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-812-g3be1bee75

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  3be1bee75347ab1eac835591eae3ca53a58008c5 (commit)
       via  9cd0b37112dc49e41c84d673ae24e473e757a920 (commit)
      from  7f9d25d58aeaba8eb0856604ce6e8abe739ead8d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3be1bee75347ab1eac835591eae3ca53a58008c5
Author: Marc Schink <de...@za...>
Date:   Sat Nov 30 15:34:20 2024 +0100

    target/mips: Remove 'ERROR: ' prefix in error log
    
    Remove the prefix since it is redundant.
    
    Change-Id: Ieecfb3583d484847514f1298e819ccf6d26abd84
    Signed-off-by: Marc Schink <de...@za...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8632
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c
index 587e20d2b..ea90d6f83 100644
--- a/src/target/mips32_pracc.c
+++ b/src/target/mips32_pracc.c
@@ -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);
 		uint32_t addr = buf_get_u32(scan_in[scan_count].scan_32.addr, 0, 32);
 		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;
 			goto exit;
 		}
diff --git a/src/target/mips64_pracc.c b/src/target/mips64_pracc.c
index 8cfce32e3..11783fe97 100644
--- a/src/target/mips64_pracc.c
+++ b/src/target/mips64_pracc.c
@@ -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;
 
 		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;
 		}
 
 		if (!ctx->local_iparam) {
-			LOG_ERROR("Error: unexpected reading of input parameter");
+			LOG_ERROR("unexpected reading of input parameter");
 			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;
 		if (!ctx->local_oparam) {
-			LOG_ERROR("Error: unexpected reading of output parameter");
+			LOG_ERROR("unexpected reading of output parameter");
 			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)) {
 		offset = (address - MIPS64_PRACC_PARAM_IN) / MIPS64_PRACC_DATA_STEP;
 		if (!ctx->local_iparam) {
-			LOG_ERROR("Error: unexpected writing of input parameter");
+			LOG_ERROR("unexpected writing of input parameter");
 			return ERROR_JTAG_DEVICE_ERROR;
 		}
 		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)) {
 		offset = (address - MIPS64_PRACC_PARAM_OUT) / MIPS64_PRACC_DATA_STEP;
 		if (!ctx->local_oparam) {
-			LOG_ERROR("Error: unexpected writing of output parameter");
+			LOG_ERROR("unexpected writing of output parameter");
 			return ERROR_JTAG_DEVICE_ERROR;
 		}
 		ctx->local_oparam[offset] = data;
 	} else if (address == MIPS64_PRACC_STACK) {
 		/* save data onto our stack */
 		if (ctx->stack_offset >= STACK_DEPTH) {
-			LOG_ERROR("Error: PrAcc stack depth exceeded");
+			LOG_ERROR("PrAcc stack depth exceeded");
 			return ERROR_FAIL;
 		}
 		ctx->stack[ctx->stack_offset++] = data;

commit 9cd0b37112dc49e41c84d673ae24e473e757a920
Author: Marc Schink <de...@za...>
Date:   Sat Nov 30 15:32:09 2024 +0100

    target/xtensa: Remove 'ERROR: ' prefix in error log
    
    Remove the prefix since it is redundant. While at it, also
    get rid of the useless exclamation mark.
    
    Change-Id: I16fd6a88b533fac19b4c622cf9740fd32ba7892c
    Signed-off-by: Marc Schink <de...@za...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8611
    Reviewed-by: Richard Allen <rs...@gm...>
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/src/target/xtensa/xtensa.c b/src/target/xtensa/xtensa.c
index fe1b83bc3..3b888fe5f 100644
--- a/src/target/xtensa/xtensa.c
+++ b/src/target/xtensa/xtensa.c
@@ -503,7 +503,7 @@ static enum xtensa_reg_id xtensa_windowbase_offset_to_canonical(struct xtensa *x
 	} else if (reg_idx >= XT_REG_IDX_A0 && reg_idx <= XT_REG_IDX_A15) {
 		idx = reg_idx - XT_REG_IDX_A0;
 	} else {
-		LOG_ERROR("Error: can't convert register %d to non-windowbased register!", reg_idx);
+		LOG_ERROR("Can't convert register %d to non-windowbased register", reg_idx);
 		return -1;
 	}
 	/* Each windowbase value represents 4 registers on LX and 8 on NX */

-----------------------------------------------------------------------

Summary of changes:
 src/target/mips32_pracc.c  |  2 +-
 src/target/mips64_pracc.c  | 12 ++++++------
 src/target/xtensa/xtensa.c |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository