[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-1312-gaa9ff8dc5

[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  aa9ff8dc5ec60c46134f57a2f858149bb083036e (commit)
      from  ac6972ba16b471cb46a2d862fb24d54b98b4bb61 (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 aa9ff8dc5ec60c46134f57a2f858149bb083036e
Author: Tomas Vanek <va...@fb...>
Date:   Mon Oct 13 18:35:37 2025 +0200

    target/esirisc_trace: drop macro BIT_MASK() conflicting with bits.h
    
    The esirisc_trace.c uses macro BIT_MASK(), same name as a macro
    from helper/bits.h
    Drop the macro definition and use GENMASK() instead.
    
    Change-Id: I0cc6a58e5aff3f48fa9a79a99bd28124f334c4e2
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/9168
    Tested-by: jenkins
    Reviewed-by: Evgeniy Naydanov <eu...@gm...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/esirisc_trace.c b/src/target/esirisc_trace.c
index 2dc08e5d2..42bc37d30 100644
--- a/src/target/esirisc_trace.c
+++ b/src/target/esirisc_trace.c
@@ -10,6 +10,7 @@
 #endif
 
 #include <helper/binarybuffer.h>
+#include <helper/bits.h>
 #include <helper/command.h>
 #include <helper/fileio.h>
 #include <helper/log.h>
@@ -18,8 +19,6 @@
 
 #include "esirisc.h"
 
-#define BIT_MASK(x)			((1 << (x)) - 1)
-
 /* Control Fields */
 #define CONTROL_ST			(1<<0)					/* Start */
 #define CONTROL_SP			(1<<1)					/* Stop */
@@ -483,7 +482,7 @@ static int esirisc_trace_analyze_simple(struct command_invocation *cmd, uint8_t
 	struct target *target = get_current_target(cmd->ctx);
 	struct esirisc_common *esirisc = target_to_esirisc(target);
 	struct esirisc_trace *trace_info = &esirisc->trace_info;
-	const uint32_t end_of_trace = BIT_MASK(trace_info->pc_bits) << 1;
+	const uint32_t end_of_trace = GENMASK(trace_info->pc_bits, 1);
 	const uint32_t num_bits = size * 8;
 	int retval;
 

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

Summary of changes:
 src/target/esirisc_trace.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository