[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-775-gfd62626df

[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  fd62626dff25cf503a25040d3040b0a2bb9b2a76 (commit)
      from  b68d23da3c3bc67cffc750fddd64a6be9c615fdb (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 fd62626dff25cf503a25040d3040b0a2bb9b2a76
Author: Evgeniy Naydanov <evg...@sy...>
Date:   Mon Sep 16 18:01:17 2024 +0300

    target/breakpoints: fix types in `watchpoint_add_internal()`
    
    There was a conflict:
    1. commit 2cd8ebf44d1a ("breakpoints: use 64-bit type for watchpoint mask
       and value")
    2. commit 0bf3373e808a ("target/breakpoints: Use 'unsigned int' for
       length")
    
    The second commit was created erlier, but merged later so the types of
    `mask` and `value` became `uint32_t` in `watchpoint_add_internal()`.
    
    This created a bug:
    `WATCHPOINT_IGNORE_DATA_VALUE_MASK` is defined as `(~(uint64_t)0)`.
    Truncation to uint32_t makes it so the comparisons with the constant
    don't work.
    
    Change-Id: I19c414c351f52aff72a60330d83c29db7bbca375
    Signed-off-by: Evgeniy Naydanov <evg...@sy...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8500
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Reviewed-by: Jan Matyas <jan...@co...>
    Tested-by: jenkins
    Reviewed-by: zapb <de...@za...>
    Reviewed-by: Karl Palsson <ka...@tw...>

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 2fbb69e07..9378abcb1 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -500,7 +500,7 @@ struct breakpoint *breakpoint_find(struct target *target, target_addr_t address)
 }
 
 static int watchpoint_add_internal(struct target *target, target_addr_t address,
-		unsigned int length, enum watchpoint_rw rw, uint32_t value, uint32_t mask)
+		unsigned int length, enum watchpoint_rw rw, uint64_t value, uint64_t mask)
 {
 	struct watchpoint *watchpoint = target->watchpoints;
 	struct watchpoint **watchpoint_p = &target->watchpoints;

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

Summary of changes:
 src/target/breakpoints.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository