target/aarch64: Add watchpoint support

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

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 58bcc8615906d59de807ba6c192b522dbcb6d86a..c060c7cde7d577ef94f74c8f0a30d9c72db9a3af 100644 (file)
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -41,7 +41,7 @@ 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,
+static int breakpoint_add_internal(struct target *target,
        target_addr_t address,
        uint32_t length,
        enum breakpoint_type type)
@@ -60,9 +60,9 @@ int breakpoint_add_internal(struct target *target,
                         * breakpoint" ... check all the parameters before
                         * succeeding.
                         */
-                       LOG_DEBUG("Duplicate Breakpoint address: " TARGET_ADDR_FMT " (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;
@@ -106,7 +106,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)
@@ -124,9 +124,9 @@ int context_breakpoint_add_internal(struct target *target,
                         * 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,7 +158,7 @@ int context_breakpoint_add_internal(struct target *target,
        return ERROR_OK;
 }
 
-int hybrid_breakpoint_add_internal(struct target *target,
+static int hybrid_breakpoint_add_internal(struct target *target,
        target_addr_t address,
        uint32_t asid,
        uint32_t length,
@@ -176,13 +176,13 @@ int hybrid_breakpoint_add_internal(struct target *target,
                         * 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: " TARGET_ADDR_FMT " (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;
@@ -241,6 +241,7 @@ int breakpoint_add(struct target *target,
        } else
                return breakpoint_add_internal(target, address, length, type);
 }
+
 int context_breakpoint_add(struct target *target,
        uint32_t asid,
        uint32_t length,
@@ -262,6 +263,7 @@ int context_breakpoint_add(struct target *target,
        } else
                return context_breakpoint_add_internal(target, asid, length, type);
 }
+
 int hybrid_breakpoint_add(struct target *target,
        target_addr_t address,
        uint32_t asid,
@@ -310,7 +312,7 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint
        free(breakpoint);
 }
 
-int breakpoint_remove_internal(struct target *target, target_addr_t address)
+static int breakpoint_remove_internal(struct target *target, target_addr_t address)
 {
        struct breakpoint *breakpoint = target->breakpoints;
 
@@ -330,6 +332,18 @@ int breakpoint_remove_internal(struct target *target, target_addr_t address)
                return 0;
        }
 }
+
+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;
@@ -348,7 +362,23 @@ void breakpoint_remove(struct target *target, target_addr_t address)
                breakpoint_remove_internal(target, address);
 }
 
-void breakpoint_clear_target_internal(struct target *target)
+void breakpoint_remove_all(struct target *target)
+{
+       if (target->smp) {
+               struct target_list *head;
+               struct target *curr;
+               head = target->head;
+               while (head != (struct target_list *)NULL) {
+                       curr = head->target;
+                       breakpoint_remove_all_internal(curr);
+                       head = head->next;
+               }
+       } else {
+               breakpoint_remove_all_internal(target);
+       }
+}
+
+static void breakpoint_clear_target_internal(struct target *target)
 {
        LOG_DEBUG("Delete all breakpoints for target: %s",
                target_name(target));