[PATCH]: 5595611c06 target: Fix an issue with rwp/rbp command in smp targets

[gerrit]

This is an automated email from Gerrit.

"Kirill Radkin <kirill.rad...@syntacore.com>" just uploaded a new patch set to 
Gerrit, which you can find at https://review.openocd.org/c/openocd/+/7910

-- gerrit

commit 5595611c0624ace33dfc6b3677aa9e3ed137304b
Author: Kirill Radkin <kirill.rad...@syntacore.com>
Date:   Tue Sep 26 16:49:09 2023 +0300

    target: Fix an issue with rwp/rbp command in smp targets
    
    If wp/bp is missing at address rwp/rbp won't return zero code (on smp).
    Now it fixed.
    
    Change-Id: I3a3c245f7088fc23227b286d2191fc7f3edba702
    Signed-off-by: Kirill Radkin <kirill.rad...@syntacore.com>

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 5ce0346bb4..b845093350 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -348,11 +348,11 @@ int breakpoint_remove(struct target *target, 
target_addr_t address)
 
                        if (status != ERROR_BREAKPOINT_NOT_FOUND) {
                                num_found_breakpoints++;
+                       }
 
-                               if (status != ERROR_OK) {
-                                       LOG_TARGET_ERROR(curr, "failed to 
remove breakpoint at address " TARGET_ADDR_FMT, address);
-                                       retval = status;
-                               }
+                       if (status != ERROR_OK) {
+                               LOG_TARGET_ERROR(curr, "failed to remove 
breakpoint at address " TARGET_ADDR_FMT, address);
+                               retval = status;
                        }
                }
 
@@ -589,11 +589,11 @@ int watchpoint_remove(struct target *target, 
target_addr_t address)
 
                        if (status != ERROR_WATCHPOINT_NOT_FOUND) {
                                num_found_watchpoints++;
+                       }
 
-                               if (status != ERROR_OK) {
-                                       LOG_TARGET_ERROR(curr, "failed to 
remove watchpoint at address" TARGET_ADDR_FMT, address);
-                                       retval = status;
-                               }
+                       if (status != ERROR_OK) {
+                               LOG_TARGET_ERROR(curr, "failed to remove 
watchpoint at address" TARGET_ADDR_FMT, address);
+                               retval = status;
                        }
                }
        } else {

--