Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Clear all dangling breakpoints upon GDB connection.
[openocd.git] / src / target / breakpoints.c
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index ac8d7dfd6e773d21b8f3d057ac00db4744d8ed78..4a949cca700c1e7a29aab5673a5b7548e241a9df 100644 (file)
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -48,7 +48,7 @@ int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_ty
        breakpoint_t *breakpoint = target->breakpoints;
        breakpoint_t **breakpoint_p = &target->breakpoints;
        int retval;
-               
+       
        while (breakpoint)
        {
                if (breakpoint->address == address)
@@ -62,7 +62,7 @@ int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_ty
        (*breakpoint_p)->length = length;
        (*breakpoint_p)->type = type;
        (*breakpoint_p)->set = 0;
-       (*breakpoint_p)->orig_instr = malloc(CEIL(length, 8));
+       (*breakpoint_p)->orig_instr = malloc(length);
        (*breakpoint_p)->next = NULL;
        
        if ((retval = target->type->add_breakpoint(target, *breakpoint_p)) != ERROR_OK)
@@ -70,38 +70,59 @@ int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_ty
                switch (retval)
                {
                        case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-                               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", breakpoint_type_strings[(*breakpoint_p)->type]);
                                free((*breakpoint_p)->orig_instr);
                                free(*breakpoint_p);
                                *breakpoint_p = NULL;
                                return retval;
                                break;
                        case ERROR_TARGET_NOT_HALTED:
-                               INFO("can't add breakpoint while target is running");
+                               LOG_INFO("can't add breakpoint while target is running");
                                free((*breakpoint_p)->orig_instr);
                                free(*breakpoint_p);
                                *breakpoint_p = NULL;
                                return retval;
                                break;
                        default:
-                               ERROR("unknown error");
-                               exit(-1);
                                break;
                }
        }
        
-       DEBUG("added %s breakpoint at 0x%8.8x of length 0x%8.8x", 
+       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);
        
        return ERROR_OK;
 }
 
+/* free up a breakpoint */
+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)
+                       break;
+               breakpoint_p = &breakpoint->next;
+               breakpoint = breakpoint->next;
+       }
+       
+       if (breakpoint==NULL)
+               return;
+       
+       target->type->remove_breakpoint(target, breakpoint);
+       
+       (*breakpoint_p) = breakpoint->next;
+       free(breakpoint->orig_instr);
+       free(breakpoint);
+}
+
 int breakpoint_remove(target_t *target, u32 address)
 {
        breakpoint_t *breakpoint = target->breakpoints;
        breakpoint_t **breakpoint_p = &target->breakpoints;
-       int retval;
        
        while (breakpoint)
        {
@@ -113,32 +134,25 @@ int breakpoint_remove(target_t *target, u32 address)
        
        if (breakpoint)
        {
-               if ((retval = target->type->remove_breakpoint(target, breakpoint)) != ERROR_OK)
-               {
-                       switch (retval)
-                       {
-                               case ERROR_TARGET_NOT_HALTED:
-                                       INFO("can't remove breakpoint while target is running");
-                                       return retval;
-                                       break;
-                               default:
-                                       ERROR("unknown error");
-                                       exit(-1);
-                                       break;
-                       }
-               }
-               (*breakpoint_p) = breakpoint->next;
-               free(breakpoint->orig_instr);
-               free(breakpoint);
+               breakpoint_free(target, breakpoint);
        }
        else
        {
-               ERROR("no breakpoint at address 0x%8.8x found", address);
+               LOG_ERROR("no breakpoint at address 0x%8.8x found", address);
        }
        
        return ERROR_OK;
 }
 
+void breakpoint_clear_target(target_t *target)
+{
+       breakpoint_t *breakpoint;
+       while ((breakpoint = target->breakpoints)!=NULL)
+       {
+               breakpoint_free(target, breakpoint);
+       }
+}
+
 breakpoint_t* breakpoint_find(target_t *target, u32 address)
 {
        breakpoint_t *breakpoint = target->breakpoints;
@@ -181,36 +195,57 @@ int watchpoint_add(target_t *target, u32 address, u32 length, enum watchpoint_rw
                switch (retval)
                {
                        case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-                               INFO("can't add %s watchpoint, resource not available", watchpoint_rw_strings[(*watchpoint_p)->rw]);
+                               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:
-                               INFO("can't add watchpoint while target is running");
+                               LOG_INFO("can't add watchpoint while target is running");
                                free (*watchpoint_p);
                                *watchpoint_p = NULL;
                                return retval;
                                break;
                        default:
-                               ERROR("unknown error");
+                               LOG_ERROR("unknown error");
                                exit(-1);
                                break;
                }
        }
        
-       DEBUG("added %s watchpoint at 0x%8.8x of length 0x%8.8x",
+       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);
        
        return ERROR_OK;
 }
 
+static void watchpoint_free(target_t *target, watchpoint_t *watchpoint_remove)
+{
+       watchpoint_t *watchpoint = target->watchpoints;
+       watchpoint_t **watchpoint_p = &target->watchpoints;
+
+       while (watchpoint)
+       {
+               if (watchpoint == watchpoint_remove)
+                       break;
+               watchpoint_p = &watchpoint->next;
+               watchpoint = watchpoint->next;
+       }
+       
+       if (watchpoint==NULL)
+               return;
+       target->type->remove_watchpoint(target, watchpoint);
+       (*watchpoint_p) = watchpoint->next;
+       free(watchpoint);
+}
+
+
+
 int watchpoint_remove(target_t *target, u32 address)
 {
        watchpoint_t *watchpoint = target->watchpoints;
        watchpoint_t **watchpoint_p = &target->watchpoints;
-       int retval;
        
        while (watchpoint)
        {
@@ -222,18 +257,22 @@ int watchpoint_remove(target_t *target, u32 address)
        
        if (watchpoint)
        {
-               if ((retval = target->type->remove_watchpoint(target, watchpoint)) != ERROR_OK)
-               {
-                       ERROR("BUG: can't remove watchpoint");
-                       exit(-1);
-               }
-               (*watchpoint_p) = watchpoint->next;
-               free(watchpoint);
+               watchpoint_free(target, watchpoint);
        }
        else
        {
-               ERROR("no watchpoint at address 0x%8.8x found", address);
+               LOG_ERROR("no watchpoint at address 0x%8.8x found", address);
        }
        
        return ERROR_OK;
 }
+
+
+void watchpoint_clear_target(target_t *target)
+{
+       watchpoint_t *watchpoint;
+       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)