Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
FLASH/NOR: Remove useless file avrf.h
[openocd.git] / src / target / breakpoints.c
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index f2b6ff780e7683c6bb041b64b56f26a54aa66594..917dfc7897cf0aa4c6fc4873f7c4054572a7b211 100644 (file)
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "target.h"
-#include "log.h"
+#include <helper/log.h>
 #include "breakpoints.h"
 
 
@@ -53,7 +53,11 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu
        while (breakpoint)
        {
                n++;
-               if (breakpoint->address == address){
+               if (breakpoint->address == address) {
+                       /* FIXME don't assume "same address" means "same
+                        * breakpoint" ... check all the parameters before
+                        * succeeding.
+                        */
                        LOG_DEBUG("Duplicate Breakpoint address: 0x%08" PRIx32 " (BP %d)",
                                  address, breakpoint->unique_id );
                        return ERROR_OK;
@@ -71,31 +75,14 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu
        (*breakpoint_p)->next = NULL;
        (*breakpoint_p)->unique_id = bpwp_unique_id++;
 
-       if ((retval = target_add_breakpoint(target, *breakpoint_p)) != ERROR_OK)
+       retval = target_add_breakpoint(target, *breakpoint_p);
+       if (retval != ERROR_OK)
        {
-               switch (retval)
-               {
-                       case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-                               LOG_INFO("can't add %s breakpoint, resource not available (BPID=%d)",
-                                        breakpoint_type_strings[(*breakpoint_p)->type],
-                                        (*breakpoint_p)->unique_id );
-
-                               free((*breakpoint_p)->orig_instr);
-                               free(*breakpoint_p);
-                               *breakpoint_p = NULL;
-                               return retval;
-                               break;
-                       case ERROR_TARGET_NOT_HALTED:
-                               LOG_INFO("can't add breakpoint while target is running (BPID: %d)",
-                                                (*breakpoint_p)->unique_id );
-                               free((*breakpoint_p)->orig_instr);
-                               free(*breakpoint_p);
-                               *breakpoint_p = NULL;
-                               return retval;
-                               break;
-                       default:
-                               break;
-               }
+               LOG_ERROR("could not add breakpoint");
+               free((*breakpoint_p)->orig_instr);
+               free(*breakpoint_p);
+               *breakpoint_p = NULL;
+               return retval;
        }
 
        LOG_DEBUG("added %s breakpoint at 0x%8.8" PRIx32 " of length 0x%8.8x, (BPID: %d)",
@@ -107,14 +94,15 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu
 }
 
 /* free up a breakpoint */
-static void breakpoint_free(struct target *target, struct breakpoint *breakpoint_remove)
+static void breakpoint_free(struct target *target, struct breakpoint *breakpoint_to_remove)
 {
        struct breakpoint *breakpoint = target->breakpoints;
        struct breakpoint **breakpoint_p = &target->breakpoints;
+       int retval;
 
        while (breakpoint)
        {
-               if (breakpoint == breakpoint_remove)
+               if (breakpoint == breakpoint_to_remove)
                        break;
                breakpoint_p = &breakpoint->next;
                breakpoint = breakpoint->next;
@@ -123,9 +111,9 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint
        if (breakpoint == NULL)
                return;
 
-       target_remove_breakpoint(target, breakpoint);
+       retval = target_remove_breakpoint(target, breakpoint);
 
-       LOG_DEBUG("BPID: %d", breakpoint->unique_id );
+       LOG_DEBUG("free BPID: %d --> %d", breakpoint->unique_id, retval);
        (*breakpoint_p) = breakpoint->next;
        free(breakpoint->orig_instr);
        free(breakpoint);
@@ -157,7 +145,9 @@ void breakpoint_remove(struct target *target, uint32_t address)
 void breakpoint_clear_target(struct target *target)
 {
        struct breakpoint *breakpoint;
-       LOG_DEBUG("Delete all breakpoints for target: %s", target_get_name( target ));
+
+       LOG_DEBUG("Delete all breakpoints for target: %s",
+                       target_name(target));
        while ((breakpoint = target->breakpoints) != NULL)
        {
                breakpoint_free(target, breakpoint);
@@ -184,7 +174,6 @@ int watchpoint_add(struct target *target, uint32_t address, uint32_t length,
        struct watchpoint *watchpoint = target->watchpoints;
        struct watchpoint **watchpoint_p = &target->watchpoints;
        int retval;
-       char *reason;
 
        while (watchpoint)
        {
@@ -215,43 +204,35 @@ int watchpoint_add(struct target *target, uint32_t address, uint32_t length,
        (*watchpoint_p)->unique_id = bpwp_unique_id++;
 
        retval = target_add_watchpoint(target, *watchpoint_p);
-       switch (retval) {
-       case ERROR_OK:
-               break;
-       case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-               reason = "resource not available";
-               goto bye;
-       case ERROR_TARGET_NOT_HALTED:
-               reason = "target running";
-               goto bye;
-       default:
-               reason = "unrecognized error";
-bye:
-               LOG_ERROR("can't add %s watchpoint at 0x%8.8" PRIx32 ", %s",
+       if (retval != ERROR_OK)
+       {
+               LOG_ERROR("can't add %s watchpoint at 0x%8.8" PRIx32,
                         watchpoint_rw_strings[(*watchpoint_p)->rw],
-                        address, reason);
+                        address);
                free (*watchpoint_p);
                *watchpoint_p = NULL;
                return retval;
        }
 
-       LOG_DEBUG("added %s watchpoint at 0x%8.8" PRIx32 " of length 0x%8.8x (WPID: %d)",
-                         watchpoint_rw_strings[(*watchpoint_p)->rw],
-                         (*watchpoint_p)->address,
-                         (*watchpoint_p)->length,
-                         (*watchpoint_p)->unique_id );
+       LOG_DEBUG("added %s watchpoint at 0x%8.8" PRIx32
+                       " of length 0x%8.8" PRIx32 " (WPID: %d)",
+                       watchpoint_rw_strings[(*watchpoint_p)->rw],
+                       (*watchpoint_p)->address,
+                       (*watchpoint_p)->length,
+                       (*watchpoint_p)->unique_id );
 
        return ERROR_OK;
 }
 
-static void watchpoint_free(struct target *target, struct watchpoint *watchpoint_remove)
+static void watchpoint_free(struct target *target, struct watchpoint *watchpoint_to_remove)
 {
        struct watchpoint *watchpoint = target->watchpoints;
        struct watchpoint **watchpoint_p = &target->watchpoints;
+       int retval;
 
        while (watchpoint)
        {
-               if (watchpoint == watchpoint_remove)
+               if (watchpoint == watchpoint_to_remove)
                        break;
                watchpoint_p = &watchpoint->next;
                watchpoint = watchpoint->next;
@@ -259,8 +240,8 @@ static void watchpoint_free(struct target *target, struct watchpoint *watchpoint
 
        if (watchpoint == NULL)
                return;
-       target_remove_watchpoint(target, watchpoint);
-       LOG_DEBUG("WPID: %d", watchpoint->unique_id );
+       retval = target_remove_watchpoint(target, watchpoint);
+       LOG_DEBUG("free WPID: %d --> %d", watchpoint->unique_id, retval);
        (*watchpoint_p) = watchpoint->next;
        free(watchpoint);
 }
@@ -291,7 +272,9 @@ void watchpoint_remove(struct target *target, uint32_t address)
 void watchpoint_clear_target(struct target *target)
 {
        struct watchpoint *watchpoint;
-       LOG_DEBUG("Delete all watchpoints for target: %s", target_get_name( target ));
+
+       LOG_DEBUG("Delete all watchpoints for target: %s",
+                       target_name(target));
        while ((watchpoint = target->watchpoints) != NULL)
        {
                watchpoint_free(target, watchpoint);
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)