Remove annoying end-of-line whitespace from most src/*

[fw/openocd] / src / target / breakpoints.c

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index b1faf5ad38df1f31823c8abe75ed21bfe20d5637..88986518543ca569bb2c7addfcfb32a2bfe71e16 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.8" PRIx32 " 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,7 +143,7 @@ void breakpoint_remove(target_t *target, uint32_t address)
                breakpoint_p = &breakpoint->next;
                breakpoint = breakpoint->next;
        }
-       
+
        if (breakpoint)
        {
                breakpoint_free(target, breakpoint);
@@ -141,7 +157,8 @@ void breakpoint_remove(target_t *target, uint32_t 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,14 +167,14 @@ 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;
 }
 
@@ -166,7 +183,7 @@ int watchpoint_add(target_t *target, uint32_t address, uint32_t length, enum wat
        watchpoint_t *watchpoint = target->watchpoints;
        watchpoint_t **watchpoint_p = &target->watchpoints;
        int retval;
-               
+
        while (watchpoint)
        {
                if (watchpoint->address == address)
@@ -174,7 +191,7 @@ int watchpoint_add(target_t *target, uint32_t address, uint32_t length, enum wat
                watchpoint_p = &watchpoint->next;
                watchpoint = watchpoint->next;
        }
-       
+
        (*watchpoint_p) = malloc(sizeof(watchpoint_t));
        (*watchpoint_p)->address = address;
        (*watchpoint_p)->length = length;
@@ -183,19 +200,23 @@ int watchpoint_add(target_t *target, uint32_t address, uint32_t length, enum wat
        (*watchpoint_p)->rw = rw;
        (*watchpoint_p)->set = 0;
        (*watchpoint_p)->next = NULL;
-               
+       (*watchpoint_p)->unique_id = bpwp_unique_id++;
+
        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]);
+                               LOG_INFO("can't add %s watchpoint, resource not available (WPID: %d)",
+                                        watchpoint_rw_strings[(*watchpoint_p)->rw],
+                                        (*watchpoint_p)->unique_id );
                                free (*watchpoint_p);
                                *watchpoint_p = NULL;
                                return retval;
                                break;
                        case ERROR_TARGET_NOT_HALTED:
-                               LOG_INFO("can't add watchpoint while target is running");
+                               LOG_INFO("can't add watchpoint while target is running (WPID: %d)",
+                                                (*watchpoint_p)->unique_id );
                                free (*watchpoint_p);
                                *watchpoint_p = NULL;
                                return retval;
@@ -206,11 +227,13 @@ int watchpoint_add(target_t *target, uint32_t address, uint32_t length, enum wat
                                break;
                }
        }
-       
-       LOG_DEBUG("added %s watchpoint at 0x%8.8" PRIx32 " 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 +249,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 +262,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,7 +270,7 @@ void watchpoint_remove(target_t *target, uint32_t address)
                watchpoint_p = &watchpoint->next;
                watchpoint = watchpoint->next;
        }
-       
+
        if (watchpoint)
        {
                watchpoint_free(target, watchpoint);
@@ -260,7 +284,8 @@ void watchpoint_remove(target_t *target, uint32_t 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);
        }