From d73de4c07c726fb0dc86f6ee6bac53fccbd62a87 Mon Sep 17 00:00:00 2001 From: Tomas Vanek Date: Wed, 6 Feb 2019 19:07:15 +0100 Subject: [PATCH] target/cortex_m: remove target halted check when removing a breakpoint MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove the target halted check from cortex_m_remove_breakpoint() as there is no such check in cortex_m_set_breakpoint() and bp can be safely removed from the running target. While on it return the error code from cortex_m_unset_breakpoint() to higher level. Change-Id: I2b358c3661feed84297913e9f589bdf1e4de7e64 Signed-off-by: Tomas Vanek Reviewed-on: http://openocd.zylin.com/4887 Tested-by: jenkins Reviewed-by: Matthias Welwarsky Reviewed-by: Jānis Skujenieks Reviewed-by: Christopher Head --- src/target/cortex_m.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c index 8c43016cbf..d341d45729 100644 --- a/src/target/cortex_m.c +++ b/src/target/cortex_m.c @@ -1288,16 +1288,10 @@ int cortex_m_add_breakpoint(struct target *target, struct breakpoint *breakpoint int cortex_m_remove_breakpoint(struct target *target, struct breakpoint *breakpoint) { - /* REVISIT why check? FPB can be updated with core running ... */ - if (target->state != TARGET_HALTED) { - LOG_WARNING("target not halted"); - return ERROR_TARGET_NOT_HALTED; - } - - if (breakpoint->set) - cortex_m_unset_breakpoint(target, breakpoint); + if (!breakpoint->set) + return ERROR_OK; - return ERROR_OK; + return cortex_m_unset_breakpoint(target, breakpoint); } int cortex_m_set_watchpoint(struct target *target, struct watchpoint *watchpoint) -- 2.30.2