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.

Fixes: 022e438292de ("target: Change policy of removing watchpoints/breakpoints.")
Change-Id: I3a3c245f7088fc23227b286d2191fc7f3edba702
Signed-off-by: Kirill Radkin <kirill.radkin@syntacore.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7910
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 5ce0346bb4664d2eba05b07b89d091518e2a0781..4a613cc284f8d9c64113e3987c44ed8a3b31dad4 100644 (file)
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -367,8 +367,10 @@ int breakpoint_remove(struct target *target, target_addr_t address)
                }
        }
 
-       if (num_found_breakpoints == 0)
+       if (num_found_breakpoints == 0) {
                LOG_TARGET_ERROR(target, "no breakpoint at address " TARGET_ADDR_FMT " found", address);
+               return ERROR_BREAKPOINT_NOT_FOUND;
+       }
 
        return retval;
 }
@@ -591,7 +593,7 @@ int watchpoint_remove(struct target *target, target_addr_t address)
                                num_found_watchpoints++;
 
                                if (status != ERROR_OK) {
-                                       LOG_TARGET_ERROR(curr, "failed to remove watchpoint at address" TARGET_ADDR_FMT, address);
+                                       LOG_TARGET_ERROR(curr, "failed to remove watchpoint at address " TARGET_ADDR_FMT, address);
                                        retval = status;
                                }
                        }
@@ -603,12 +605,14 @@ int watchpoint_remove(struct target *target, target_addr_t address)
                        num_found_watchpoints++;
 
                        if (retval != ERROR_OK)
-                               LOG_TARGET_ERROR(target, "failed to remove watchpoint at address" TARGET_ADDR_FMT, address);
+                               LOG_TARGET_ERROR(target, "failed to remove watchpoint at address " TARGET_ADDR_FMT, address);
                }
        }
 
-       if (num_found_watchpoints == 0)
+       if (num_found_watchpoints == 0) {
                LOG_TARGET_ERROR(target, "no watchpoint at address " TARGET_ADDR_FMT " found", address);
+               return ERROR_WATCHPOINT_NOT_FOUND;
+       }
 
        return retval;
 }