Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
armv7m_core_reg_t -> struct armv7m_core_reg
[openocd.git] / src / target / breakpoints.c
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 07fcb3adea4f65b186db202fd90bac1e6887dac3..dd672b9fef22d6aebd340a05054aa5cc600728e1 100644 (file)
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -39,20 +39,29 @@ static char *watchpoint_rw_strings[] =
        "access"
 };
 
+// monotonic counter/id-number for breakpoints and watch points
+static int bpwp_unique_id;
+
 int breakpoint_add(target_t *target, uint32_t address, uint32_t length, enum breakpoint_type type)
 {
        breakpoint_t *breakpoint = target->breakpoints;
        breakpoint_t **breakpoint_p = &target->breakpoints;
        int retval;
-       
+       int n;
+
+       n = 0;
        while (breakpoint)
        {
-               if (breakpoint->address == address)
+               n++;
+               if (breakpoint->address == address){
+                       LOG_DEBUG("Duplicate Breakpoint address: 0x%08" PRIx32 " (BP %d)",
+                                 address, breakpoint->unique_id );
                        return ERROR_OK;
+               }
                breakpoint_p = &breakpoint->next;
                breakpoint = breakpoint->next;
        }
-               
+
        (*breakpoint_p) = malloc(sizeof(breakpoint_t));
        (*breakpoint_p)->address = address;
        (*breakpoint_p)->length = length;
@@ -60,20 +69,25 @@ int breakpoint_add(target_t *target, uint32_t address, uint32_t length, enum bre
        (*breakpoint_p)->set = 0;
        (*breakpoint_p)->orig_instr = malloc(length);
        (*breakpoint_p)->next = NULL;
-       
+       (*breakpoint_p)->unique_id = bpwp_unique_id++;
+
        if ((retval = target_add_breakpoint(target, *breakpoint_p)) != ERROR_OK)
        {
                switch (retval)
                {
                        case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-                               LOG_INFO("can't add %s breakpoint, resource not available", breakpoint_type_strings[(*breakpoint_p)->type]);
+                               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");
+                               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;
@@ -83,11 +97,12 @@ int breakpoint_add(target_t *target, uint32_t address, uint32_t length, enum bre
                                break;
                }
        }
-       
-       LOG_DEBUG("added %s breakpoint at 0x%8.8x of length 0x%8.8x", 
-               breakpoint_type_strings[(*breakpoint_p)->type],
-               (*breakpoint_p)->address, (*breakpoint_p)->length);
-       
+
+       LOG_DEBUG("added %s breakpoint at 0x%8.8" PRIx32 " of length 0x%8.8x, (BPID: %d)",
+                         breakpoint_type_strings[(*breakpoint_p)->type],
+                         (*breakpoint_p)->address, (*breakpoint_p)->length,
+                         (*breakpoint_p)->unique_id  );
+
        return ERROR_OK;
 }
 
@@ -96,20 +111,21 @@ static void breakpoint_free(target_t *target, breakpoint_t *breakpoint_remove)
 {
        breakpoint_t *breakpoint = target->breakpoints;
        breakpoint_t **breakpoint_p = &target->breakpoints;
-       
+
        while (breakpoint)
        {
-               if (breakpoint==breakpoint_remove)
+               if (breakpoint == breakpoint_remove)
                        break;
                breakpoint_p = &breakpoint->next;
                breakpoint = breakpoint->next;
        }
-       
-       if (breakpoint==NULL)
+
+       if (breakpoint == NULL)
                return;
-       
+
        target_remove_breakpoint(target, breakpoint);
-       
+
+       LOG_DEBUG("BPID: %d", breakpoint->unique_id );
        (*breakpoint_p) = breakpoint->next;
        free(breakpoint->orig_instr);
        free(breakpoint);
@@ -119,7 +135,7 @@ void breakpoint_remove(target_t *target, uint32_t address)
 {
        breakpoint_t *breakpoint = target->breakpoints;
        breakpoint_t **breakpoint_p = &target->breakpoints;
-       
+
        while (breakpoint)
        {
                if (breakpoint->address == address)
@@ -127,21 +143,22 @@ void breakpoint_remove(target_t *target, uint32_t address)
                breakpoint_p = &breakpoint->next;
                breakpoint = breakpoint->next;
        }
-       
+
        if (breakpoint)
        {
                breakpoint_free(target, breakpoint);
        }
        else
        {
-               LOG_ERROR("no breakpoint at address 0x%8.8x found", address);
+               LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address);
        }
 }
 
 void breakpoint_clear_target(target_t *target)
 {
        breakpoint_t *breakpoint;
-       while ((breakpoint = target->breakpoints)!=NULL)
+       LOG_DEBUG("Delete all breakpoints for target: %s", target_get_name( target ));
+       while ((breakpoint = target->breakpoints) != NULL)
        {
                breakpoint_free(target, breakpoint);
        }
@@ -150,67 +167,80 @@ void breakpoint_clear_target(target_t *target)
 breakpoint_t* breakpoint_find(target_t *target, uint32_t address)
 {
        breakpoint_t *breakpoint = target->breakpoints;
-       
+
        while (breakpoint)
        {
                if (breakpoint->address == address)
                        return breakpoint;
                breakpoint = breakpoint->next;
        }
-       
+
        return NULL;
 }
 
-int watchpoint_add(target_t *target, uint32_t address, uint32_t length, enum watchpoint_rw rw, uint32_t value, uint32_t mask)
+int watchpoint_add(target_t *target, uint32_t address, uint32_t length,
+               enum watchpoint_rw rw, uint32_t value, uint32_t mask)
 {
        watchpoint_t *watchpoint = target->watchpoints;
        watchpoint_t **watchpoint_p = &target->watchpoints;
        int retval;
-               
+       char *reason;
+
        while (watchpoint)
        {
-               if (watchpoint->address == address)
+               if (watchpoint->address == address) {
+                       if (watchpoint->length != length
+                                       || watchpoint->value != value
+                                       || watchpoint->mask != mask
+                                       || watchpoint->rw != rw) {
+                               LOG_ERROR("address 0x%8.8" PRIx32
+                                               "already has watchpoint %d",
+                                               address, watchpoint->unique_id);
+                               return ERROR_FAIL;
+                       }
+
+                       /* ignore duplicate watchpoint */
                        return ERROR_OK;
+               }
                watchpoint_p = &watchpoint->next;
                watchpoint = watchpoint->next;
        }
-       
-       (*watchpoint_p) = malloc(sizeof(watchpoint_t));
+
+       (*watchpoint_p) = calloc(1, sizeof(watchpoint_t));
        (*watchpoint_p)->address = address;
        (*watchpoint_p)->length = length;
        (*watchpoint_p)->value = value;
        (*watchpoint_p)->mask = mask;
        (*watchpoint_p)->rw = rw;
-       (*watchpoint_p)->set = 0;
-       (*watchpoint_p)->next = NULL;
-               
-       if ((retval = target_add_watchpoint(target, *watchpoint_p)) != ERROR_OK)
-       {
-               switch (retval)
-               {
-                       case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-                               LOG_INFO("can't add %s watchpoint, resource not available", watchpoint_rw_strings[(*watchpoint_p)->rw]);
-                               free (*watchpoint_p);
-                               *watchpoint_p = NULL;
-                               return retval;
-                               break;
-                       case ERROR_TARGET_NOT_HALTED:
-                               LOG_INFO("can't add watchpoint while target is running");
-                               free (*watchpoint_p);
-                               *watchpoint_p = NULL;
-                               return retval;
-                               break;
-                       default:
-                               LOG_ERROR("unknown error");
-                               exit(-1);
-                               break;
-               }
+       (*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",
+                        watchpoint_rw_strings[(*watchpoint_p)->rw],
+                        address, reason);
+               free (*watchpoint_p);
+               *watchpoint_p = NULL;
+               return retval;
        }
-       
-       LOG_DEBUG("added %s watchpoint at 0x%8.8x of length 0x%8.8x",
-               watchpoint_rw_strings[(*watchpoint_p)->rw],
-               (*watchpoint_p)->address, (*watchpoint_p)->length);
-       
+
+       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 );
+
        return ERROR_OK;
 }
 
@@ -226,10 +256,11 @@ static void watchpoint_free(target_t *target, watchpoint_t *watchpoint_remove)
                watchpoint_p = &watchpoint->next;
                watchpoint = watchpoint->next;
        }
-       
-       if (watchpoint==NULL)
+
+       if (watchpoint == NULL)
                return;
        target_remove_watchpoint(target, watchpoint);
+       LOG_DEBUG("WPID: %d", watchpoint->unique_id );
        (*watchpoint_p) = watchpoint->next;
        free(watchpoint);
 }
@@ -238,7 +269,7 @@ void watchpoint_remove(target_t *target, uint32_t address)
 {
        watchpoint_t *watchpoint = target->watchpoints;
        watchpoint_t **watchpoint_p = &target->watchpoints;
-       
+
        while (watchpoint)
        {
                if (watchpoint->address == address)
@@ -246,21 +277,22 @@ void watchpoint_remove(target_t *target, uint32_t address)
                watchpoint_p = &watchpoint->next;
                watchpoint = watchpoint->next;
        }
-       
+
        if (watchpoint)
        {
                watchpoint_free(target, watchpoint);
        }
        else
        {
-               LOG_ERROR("no watchpoint at address 0x%8.8x found", address);
+               LOG_ERROR("no watchpoint at address 0x%8.8" PRIx32 " found", address);
        }
 }
 
 void watchpoint_clear_target(target_t *target)
 {
        watchpoint_t *watchpoint;
-       while ((watchpoint = target->watchpoints)!=NULL)
+       LOG_DEBUG("Delete all watchpoints for target: %s", target_get_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)