Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
target: use target_event_name()
[openocd.git] / src / target / breakpoints.c
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index c4a959df3ea949d4a70e93f4375126f70602f02d..dd901ef25ba2b5e27ca56a62e75bc070e28bed8f 100644 (file)
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -41,8 +41,8 @@ static const char * const watchpoint_rw_strings[] = {
 /* monotonic counter/id-number for breakpoints and watch points */
 static int bpwp_unique_id;
 
-int breakpoint_add_internal(struct target *target,
-       uint32_t address,
+static int breakpoint_add_internal(struct target *target,
+       target_addr_t address,
        uint32_t length,
        enum breakpoint_type type)
 {
@@ -50,19 +50,16 @@ int breakpoint_add_internal(struct target *target,
        struct breakpoint **breakpoint_p = &target->breakpoints;
        const char *reason;
        int retval;
-       int n;
 
-       n = 0;
        while (breakpoint) {
-               n++;
                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 %" PRIu32 ")",
+                       LOG_ERROR("Duplicate Breakpoint address: " TARGET_ADDR_FMT " (BP %" PRIu32 ")",
                                address, breakpoint->unique_id);
-                       return ERROR_OK;
+                       return ERROR_TARGET_DUPLICATE_BREAKPOINT;
                }
                breakpoint_p = &breakpoint->next;
                breakpoint = breakpoint->next;
@@ -98,7 +95,9 @@ fail:
                        return retval;
        }
 
-       LOG_DEBUG("added %s breakpoint at 0x%8.8" PRIx32 " of length 0x%8.8x, (BPID: %" PRIu32 ")",
+       LOG_DEBUG("[%d] added %s breakpoint at " TARGET_ADDR_FMT
+                       " of length 0x%8.8x, (BPID: %" PRIu32 ")",
+               target->coreid,
                breakpoint_type_strings[(*breakpoint_p)->type],
                (*breakpoint_p)->address, (*breakpoint_p)->length,
                (*breakpoint_p)->unique_id);
@@ -106,7 +105,7 @@ fail:
        return ERROR_OK;
 }
 
-int context_breakpoint_add_internal(struct target *target,
+static int context_breakpoint_add_internal(struct target *target,
        uint32_t asid,
        uint32_t length,
        enum breakpoint_type type)
@@ -114,19 +113,16 @@ int context_breakpoint_add_internal(struct target *target,
        struct breakpoint *breakpoint = target->breakpoints;
        struct breakpoint **breakpoint_p = &target->breakpoints;
        int retval;
-       int n;
 
-       n = 0;
        while (breakpoint) {
-               n++;
                if (breakpoint->asid == asid) {
                        /* FIXME don't assume "same address" means "same
                         * breakpoint" ... check all the parameters before
                         * succeeding.
                         */
-                       LOG_DEBUG("Duplicate Breakpoint asid: 0x%08" PRIx32 " (BP %" PRIu32 ")",
+                       LOG_ERROR("Duplicate Breakpoint asid: 0x%08" PRIx32 " (BP %" PRIu32 ")",
                                asid, breakpoint->unique_id);
-                       return -1;
+                       return ERROR_TARGET_DUPLICATE_BREAKPOINT;
                }
                breakpoint_p = &breakpoint->next;
                breakpoint = breakpoint->next;
@@ -158,8 +154,8 @@ int context_breakpoint_add_internal(struct target *target,
        return ERROR_OK;
 }
 
-int hybrid_breakpoint_add_internal(struct target *target,
-       uint32_t address,
+static int hybrid_breakpoint_add_internal(struct target *target,
+       target_addr_t address,
        uint32_t asid,
        uint32_t length,
        enum breakpoint_type type)
@@ -167,22 +163,20 @@ int hybrid_breakpoint_add_internal(struct target *target,
        struct breakpoint *breakpoint = target->breakpoints;
        struct breakpoint **breakpoint_p = &target->breakpoints;
        int retval;
-       int n;
-       n = 0;
+
        while (breakpoint) {
-               n++;
                if ((breakpoint->asid == asid) && (breakpoint->address == address)) {
                        /* FIXME don't assume "same address" means "same
                         * breakpoint" ... check all the parameters before
                         * succeeding.
                         */
-                       LOG_DEBUG("Duplicate Hybrid Breakpoint asid: 0x%08" PRIx32 " (BP %" PRIu32 ")",
+                       LOG_ERROR("Duplicate Hybrid Breakpoint asid: 0x%08" PRIx32 " (BP %" PRIu32 ")",
                                asid, breakpoint->unique_id);
-                       return -1;
+                       return ERROR_TARGET_DUPLICATE_BREAKPOINT;
                } else if ((breakpoint->address == address) && (breakpoint->asid == 0)) {
-                       LOG_DEBUG("Duplicate Breakpoint IVA: 0x%08" PRIx32 " (BP %" PRIu32 ")",
+                       LOG_ERROR("Duplicate Breakpoint IVA: " TARGET_ADDR_FMT " (BP %" PRIu32 ")",
                                address, breakpoint->unique_id);
-                       return -1;
+                       return ERROR_TARGET_DUPLICATE_BREAKPOINT;
 
                }
                breakpoint_p = &breakpoint->next;
@@ -208,7 +202,7 @@ int hybrid_breakpoint_add_internal(struct target *target,
                return retval;
        }
        LOG_DEBUG(
-               "added %s Hybrid breakpoint at address 0x%8.8" PRIx32 " of length 0x%8.8x, (BPID: %" PRIu32 ")",
+               "added %s Hybrid breakpoint at address " TARGET_ADDR_FMT " of length 0x%8.8x, (BPID: %" PRIu32 ")",
                breakpoint_type_strings[(*breakpoint_p)->type],
                (*breakpoint_p)->address,
                (*breakpoint_p)->length,
@@ -218,7 +212,7 @@ int hybrid_breakpoint_add_internal(struct target *target,
 }
 
 int breakpoint_add(struct target *target,
-       uint32_t address,
+       target_addr_t address,
        uint32_t length,
        enum breakpoint_type type)
 {
@@ -230,7 +224,7 @@ int breakpoint_add(struct target *target,
                if (type == BKPT_SOFT)
                        return breakpoint_add_internal(head->target, address, length, type);
 
-               while (head != (struct target_list *)NULL) {
+               while (head) {
                        curr = head->target;
                        retval = breakpoint_add_internal(curr, address, length, type);
                        if (retval != ERROR_OK)
@@ -238,9 +232,11 @@ int breakpoint_add(struct target *target,
                        head = head->next;
                }
                return retval;
-       } else
+       } else {
                return breakpoint_add_internal(target, address, length, type);
+       }
 }
+
 int context_breakpoint_add(struct target *target,
        uint32_t asid,
        uint32_t length,
@@ -251,7 +247,7 @@ int context_breakpoint_add(struct target *target,
                struct target_list *head;
                struct target *curr;
                head = target->head;
-               while (head != (struct target_list *)NULL) {
+               while (head) {
                        curr = head->target;
                        retval = context_breakpoint_add_internal(curr, asid, length, type);
                        if (retval != ERROR_OK)
@@ -259,11 +255,13 @@ int context_breakpoint_add(struct target *target,
                        head = head->next;
                }
                return retval;
-       } else
+       } else {
                return context_breakpoint_add_internal(target, asid, length, type);
+       }
 }
+
 int hybrid_breakpoint_add(struct target *target,
-       uint32_t address,
+       target_addr_t address,
        uint32_t asid,
        uint32_t length,
        enum breakpoint_type type)
@@ -273,7 +271,7 @@ int hybrid_breakpoint_add(struct target *target,
                struct target_list *head;
                struct target *curr;
                head = target->head;
-               while (head != (struct target_list *)NULL) {
+               while (head) {
                        curr = head->target;
                        retval = hybrid_breakpoint_add_internal(curr, address, asid, length, type);
                        if (retval != ERROR_OK)
@@ -299,7 +297,7 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint
                breakpoint = breakpoint->next;
        }
 
-       if (breakpoint == NULL)
+       if (!breakpoint)
                return;
 
        retval = target_remove_breakpoint(target, breakpoint);
@@ -310,16 +308,13 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint
        free(breakpoint);
 }
 
-int breakpoint_remove_internal(struct target *target, uint32_t address)
+static int breakpoint_remove_internal(struct target *target, target_addr_t address)
 {
        struct breakpoint *breakpoint = target->breakpoints;
 
        while (breakpoint) {
-               if ((breakpoint->address == address) && (breakpoint->asid == 0))
-                       break;
-               else if ((breakpoint->address == 0) && (breakpoint->asid == address))
-                       break;
-               else if ((breakpoint->address == address) && (breakpoint->asid != 0))
+               if ((breakpoint->address == address) ||
+                   (breakpoint->address == 0 && breakpoint->asid == address))
                        break;
                breakpoint = breakpoint->next;
        }
@@ -329,33 +324,62 @@ int breakpoint_remove_internal(struct target *target, uint32_t address)
                return 1;
        } else {
                if (!target->smp)
-                       LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address);
+                       LOG_ERROR("no breakpoint at address " TARGET_ADDR_FMT " found", address);
                return 0;
        }
 }
-void breakpoint_remove(struct target *target, uint32_t address)
+
+static void breakpoint_remove_all_internal(struct target *target)
+{
+       struct breakpoint *breakpoint = target->breakpoints;
+
+       while (breakpoint) {
+               struct breakpoint *tmp = breakpoint;
+               breakpoint = breakpoint->next;
+               breakpoint_free(target, tmp);
+       }
+}
+
+void breakpoint_remove(struct target *target, target_addr_t address)
 {
-       int found = 0;
        if (target->smp) {
+               unsigned int num_breakpoints = 0;
                struct target_list *head;
                struct target *curr;
                head = target->head;
-               while (head != (struct target_list *)NULL) {
+               while (head) {
                        curr = head->target;
-                       found += breakpoint_remove_internal(curr, address);
+                       num_breakpoints += breakpoint_remove_internal(curr, address);
                        head = head->next;
                }
-               if (found == 0)
-                       LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address);
-       } else
+               if (!num_breakpoints)
+                       LOG_ERROR("no breakpoint at address " TARGET_ADDR_FMT " found", address);
+       } else {
                breakpoint_remove_internal(target, address);
+       }
+}
+
+void breakpoint_remove_all(struct target *target)
+{
+       if (target->smp) {
+               struct target_list *head;
+               struct target *curr;
+               head = target->head;
+               while (head) {
+                       curr = head->target;
+                       breakpoint_remove_all_internal(curr);
+                       head = head->next;
+               }
+       } else {
+               breakpoint_remove_all_internal(target);
+       }
 }
 
-void breakpoint_clear_target_internal(struct target *target)
+static void breakpoint_clear_target_internal(struct target *target)
 {
        LOG_DEBUG("Delete all breakpoints for target: %s",
                target_name(target));
-       while (target->breakpoints != NULL)
+       while (target->breakpoints)
                breakpoint_free(target, target->breakpoints);
 }
 
@@ -365,17 +389,17 @@ void breakpoint_clear_target(struct target *target)
                struct target_list *head;
                struct target *curr;
                head = target->head;
-               while (head != (struct target_list *)NULL) {
+               while (head) {
                        curr = head->target;
                        breakpoint_clear_target_internal(curr);
                        head = head->next;
                }
-       } else
+       } else {
                breakpoint_clear_target_internal(target);
-
+       }
 }
 
-struct breakpoint *breakpoint_find(struct target *target, uint32_t address)
+struct breakpoint *breakpoint_find(struct target *target, target_addr_t address)
 {
        struct breakpoint *breakpoint = target->breakpoints;
 
@@ -388,8 +412,8 @@ struct breakpoint *breakpoint_find(struct target *target, uint32_t address)
        return NULL;
 }
 
-int watchpoint_add(struct target *target, uint32_t address, uint32_t length,
-       enum watchpoint_rw rw, uint32_t value, uint32_t mask)
+int watchpoint_add_internal(struct target *target, target_addr_t address,
+               uint32_t length, enum watchpoint_rw rw, uint32_t value, uint32_t mask)
 {
        struct watchpoint *watchpoint = target->watchpoints;
        struct watchpoint **watchpoint_p = &target->watchpoints;
@@ -402,7 +426,7 @@ int watchpoint_add(struct target *target, uint32_t address, uint32_t length,
                                || watchpoint->value != value
                                || watchpoint->mask != mask
                                || watchpoint->rw != rw) {
-                               LOG_ERROR("address 0x%8.8" PRIx32
+                               LOG_ERROR("address " TARGET_ADDR_FMT
                                        " already has watchpoint %d",
                                        address, watchpoint->unique_id);
                                return ERROR_FAIL;
@@ -436,7 +460,7 @@ int watchpoint_add(struct target *target, uint32_t address, uint32_t length,
                default:
                        reason = "unrecognized error";
 bye:
-                       LOG_ERROR("can't add %s watchpoint at 0x%8.8" PRIx32 ", %s",
+                       LOG_ERROR("can't add %s watchpoint at " TARGET_ADDR_FMT ", %s",
                                watchpoint_rw_strings[(*watchpoint_p)->rw],
                                address, reason);
                        free(*watchpoint_p);
@@ -444,8 +468,9 @@ bye:
                        return retval;
        }
 
-       LOG_DEBUG("added %s watchpoint at 0x%8.8" PRIx32
-               " of length 0x%8.8" PRIx32 " (WPID: %d)",
+       LOG_DEBUG("[%d] added %s watchpoint at " TARGET_ADDR_FMT
+                       " of length 0x%8.8" PRIx32 " (WPID: %d)",
+               target->coreid,
                watchpoint_rw_strings[(*watchpoint_p)->rw],
                (*watchpoint_p)->address,
                (*watchpoint_p)->length,
@@ -454,6 +479,30 @@ bye:
        return ERROR_OK;
 }
 
+int watchpoint_add(struct target *target, target_addr_t address,
+               uint32_t length, enum watchpoint_rw rw, uint32_t value, uint32_t mask)
+{
+       int retval = ERROR_OK;
+       if (target->smp) {
+               struct target_list *head;
+               struct target *curr;
+               head = target->head;
+
+               while (head != (struct target_list *)NULL) {
+                       curr = head->target;
+                       retval = watchpoint_add_internal(curr, address, length, rw, value,
+                                       mask);
+                       if (retval != ERROR_OK)
+                               return retval;
+                       head = head->next;
+               }
+               return retval;
+       } else {
+               return watchpoint_add_internal(target, address, length, rw, value,
+                               mask);
+       }
+}
+
 static void watchpoint_free(struct target *target, struct watchpoint *watchpoint_to_remove)
 {
        struct watchpoint *watchpoint = target->watchpoints;
@@ -467,7 +516,7 @@ static void watchpoint_free(struct target *target, struct watchpoint *watchpoint
                watchpoint = watchpoint->next;
        }
 
-       if (watchpoint == NULL)
+       if (!watchpoint)
                return;
        retval = target_remove_watchpoint(target, watchpoint);
        LOG_DEBUG("free WPID: %d --> %d", watchpoint->unique_id, retval);
@@ -475,7 +524,7 @@ static void watchpoint_free(struct target *target, struct watchpoint *watchpoint
        free(watchpoint);
 }
 
-void watchpoint_remove(struct target *target, uint32_t address)
+int watchpoint_remove_internal(struct target *target, target_addr_t address)
 {
        struct watchpoint *watchpoint = target->watchpoints;
 
@@ -485,21 +534,45 @@ void watchpoint_remove(struct target *target, uint32_t address)
                watchpoint = watchpoint->next;
        }
 
-       if (watchpoint)
+       if (watchpoint) {
                watchpoint_free(target, watchpoint);
-       else
-               LOG_ERROR("no watchpoint at address 0x%8.8" PRIx32 " found", address);
+               return 1;
+       } else {
+               if (!target->smp)
+                       LOG_ERROR("no watchpoint at address " TARGET_ADDR_FMT " found", address);
+               return 0;
+       }
+}
+
+void watchpoint_remove(struct target *target, target_addr_t address)
+{
+       if (target->smp) {
+               unsigned int num_watchpoints = 0;
+               struct target_list *head;
+               struct target *curr;
+               head = target->head;
+               while (head) {
+                       curr = head->target;
+                       num_watchpoints += watchpoint_remove_internal(curr, address);
+                       head = head->next;
+               }
+               if (num_watchpoints == 0)
+                       LOG_ERROR("no watchpoint at address " TARGET_ADDR_FMT " num_watchpoints", address);
+       } else {
+               watchpoint_remove_internal(target, address);
+       }
 }
 
 void watchpoint_clear_target(struct target *target)
 {
        LOG_DEBUG("Delete all watchpoints for target: %s",
                target_name(target));
-       while (target->watchpoints != NULL)
+       while (target->watchpoints)
                watchpoint_free(target, target->watchpoints);
 }
 
-int watchpoint_hit(struct target *target, enum watchpoint_rw *rw, uint32_t *address)
+int watchpoint_hit(struct target *target, enum watchpoint_rw *rw,
+                  target_addr_t *address)
 {
        int retval;
        struct watchpoint *hit_watchpoint;
@@ -511,7 +584,7 @@ int watchpoint_hit(struct target *target, enum watchpoint_rw *rw, uint32_t *addr
        *rw = hit_watchpoint->rw;
        *address = hit_watchpoint->address;
 
-       LOG_DEBUG("Found hit watchpoint at 0x%8.8" PRIx32 " (WPID: %d)",
+       LOG_DEBUG("Found hit watchpoint at " TARGET_ADDR_FMT " (WPID: %d)",
                hit_watchpoint->address,
                hit_watchpoint->unique_id);
 
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)