This is an automated email from Gerrit. "Evgeniy Naydanov <evgeniy.nayda...@syntacore.com>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/8500
-- gerrit commit 58dd7b8c51fd6c501d3e864e555fcd40455a9c77 Author: Evgeniy Naydanov <evgeniy.nayda...@syntacore.com> Date: Mon Sep 16 18:01:17 2024 +0300 target/breakpoints: fix types in `watchpoint_add_internal()` There was a conflict: 1. 2cd8ebf44d1afd59b524b09561a8bd2f90f0c27a changed `mask`'s and `value`'s type to `uint64_t`. 2. 0bf3373e808a097fdf50fc04f987c26b35ddf09d changed `length`'s type to `unsigned int`. 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 <evgeniy.nayda...@syntacore.com> diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c index 2fbb69e07a..9378abcb14 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; --