Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
cleanup: rename armv4_5 to arm for readability
[openocd.git] / src / target / breakpoints.c
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 637f681d7f4f284d68337ada46c93c03b2f906b5..c0905ede6ab5caad3dc2254465b9bedfecfc3bc6 100644 (file)
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) ST-Ericsson SA 2011                                     *
+ *   michel.jaouen@stericsson.com : smp minimum support                    *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -42,7 +45,7 @@ static char *watchpoint_rw_strings[] =
 // monotonic counter/id-number for breakpoints and watch points
 static int bpwp_unique_id;
 
-int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enum breakpoint_type type)
+int breakpoint_add_internal(struct target *target, uint32_t address, uint32_t length, enum breakpoint_type type)
 {
        struct breakpoint *breakpoint = target->breakpoints;
        struct breakpoint **breakpoint_p = &target->breakpoints;
@@ -60,7 +63,7 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu
                         * succeeding.
                         */
                        LOG_DEBUG("Duplicate Breakpoint address: 0x%08" PRIx32 " (BP %d)",
-                                 address, breakpoint->unique_id );
+                                       address, breakpoint->unique_id);
                        return ERROR_OK;
                }
                breakpoint_p = &breakpoint->next;
@@ -69,6 +72,7 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu
 
        (*breakpoint_p) = malloc(sizeof(struct breakpoint));
        (*breakpoint_p)->address = address;
+       (*breakpoint_p)->asid = 0;
        (*breakpoint_p)->length = length;
        (*breakpoint_p)->type = type;
        (*breakpoint_p)->set = 0;
@@ -97,15 +101,196 @@ fail:
        }
 
        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  );
+                       breakpoint_type_strings[(*breakpoint_p)->type],
+                       (*breakpoint_p)->address, (*breakpoint_p)->length,
+                       (*breakpoint_p)->unique_id);
 
        return ERROR_OK;
 }
 
+int context_breakpoint_add_internal(struct target *target, uint32_t asid, uint32_t length, enum breakpoint_type type)
+{
+       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 %d)",
+                                       asid, breakpoint->unique_id);
+                       return -1;
+               }
+               breakpoint_p = &breakpoint->next;
+               breakpoint = breakpoint->next;
+       }
+
+       (*breakpoint_p) = malloc(sizeof(struct breakpoint));
+       (*breakpoint_p)->address = 0;
+       (*breakpoint_p)->asid = asid;
+       (*breakpoint_p)->length = length;
+       (*breakpoint_p)->type = type;
+       (*breakpoint_p)->set = 0;
+       (*breakpoint_p)->orig_instr = malloc(length);
+       (*breakpoint_p)->next = NULL;
+       (*breakpoint_p)->unique_id = bpwp_unique_id++;
+       retval = target_add_context_breakpoint(target, *breakpoint_p);
+       if (retval != ERROR_OK)
+       {
+               LOG_ERROR("could not add breakpoint");
+               free((*breakpoint_p)->orig_instr);
+               free(*breakpoint_p);
+               *breakpoint_p = NULL;
+               return retval;
+       }
+
+       LOG_DEBUG("added %s Context breakpoint at 0x%8.8" PRIx32 " of length 0x%8.8x, (BPID: %d)",
+                       breakpoint_type_strings[(*breakpoint_p)->type],
+                       (*breakpoint_p)->asid, (*breakpoint_p)->length,
+                       (*breakpoint_p)->unique_id);
+
+       return ERROR_OK;
+}
+
+int hybrid_breakpoint_add_internal(struct target *target, uint32_t address, uint32_t asid, uint32_t length, enum breakpoint_type type)
+{
+       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 %d)",
+                                       asid, breakpoint->unique_id);
+                       return -1;
+               }
+               else if ((breakpoint->address == address) && (breakpoint->asid == 0))
+               {
+                       LOG_DEBUG("Duplicate Breakpoint IVA: 0x%08" PRIx32 " (BP %d)",
+                                       address, breakpoint->unique_id);
+                       return -1;
+
+               }
+               breakpoint_p = &breakpoint->next;
+               breakpoint = breakpoint->next;
+       }
+       (*breakpoint_p) = malloc(sizeof(struct breakpoint));
+       (*breakpoint_p)->address = address;
+       (*breakpoint_p)->asid = asid;
+       (*breakpoint_p)->length = length;
+       (*breakpoint_p)->type = type;
+       (*breakpoint_p)->set = 0;
+       (*breakpoint_p)->orig_instr = malloc(length);
+       (*breakpoint_p)->next = NULL;
+       (*breakpoint_p)->unique_id = bpwp_unique_id++;
+
+
+       retval = target_add_hybrid_breakpoint(target, *breakpoint_p);
+       if (retval != ERROR_OK)
+       {
+               LOG_ERROR("could not add breakpoint");
+               free((*breakpoint_p)->orig_instr);
+               free(*breakpoint_p);
+               *breakpoint_p = NULL;
+               return retval;
+       }
+       LOG_DEBUG("added %s Hybrid breakpoint at address 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;
+}
+
+
+
+int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enum breakpoint_type type)
+{
+
+       int retval = ERROR_OK;
+       if (target->smp)
+       {
+               struct target_list *head;
+               struct target *curr;
+               head = target->head;
+               if (type == BKPT_SOFT)
+                       return(breakpoint_add_internal(head->target, address,length, type));
+
+               while(head != (struct target_list*)NULL)
+               {
+                       curr = head->target;
+                       retval = breakpoint_add_internal(curr, address,length, type);
+                       if (retval != ERROR_OK) return retval;
+                       head = head->next;
+               }
+               return retval;
+       }
+       else
+               return(breakpoint_add_internal(target, address, length, type));
+
+}
+int context_breakpoint_add(struct target *target, uint32_t asid, uint32_t length, enum breakpoint_type type)
+{
+
+       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 = context_breakpoint_add_internal(curr, asid,length, type);
+                       if (retval != ERROR_OK) return retval;
+                       head = head->next;
+               }
+               return retval;
+       }
+       else
+               return(context_breakpoint_add_internal(target, asid, length, type));
+
+}
+int hybrid_breakpoint_add(struct target *target, uint32_t address, uint32_t asid, uint32_t length, enum breakpoint_type type)
+{
+
+       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 = hybrid_breakpoint_add_internal(curr, address, asid, length, type);
+                       if (retval != ERROR_OK) return retval;
+                       head = head->next;
+               }
+               return retval;
+       }
+       else
+               return(hybrid_breakpoint_add_internal(target, address, asid, length, type));
+
+}
+
 /* free up a breakpoint */
-static void breakpoint_free(struct target *target, struct breakpoint *breakpoint_remove)
+static void breakpoint_free(struct target *target, struct breakpoint *breakpoint_to_remove)
 {
        struct breakpoint *breakpoint = target->breakpoints;
        struct breakpoint **breakpoint_p = &target->breakpoints;
@@ -113,7 +298,7 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint
 
        while (breakpoint)
        {
-               if (breakpoint == breakpoint_remove)
+               if (breakpoint == breakpoint_to_remove)
                        break;
                breakpoint_p = &breakpoint->next;
                breakpoint = breakpoint->next;
@@ -130,30 +315,54 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint
        free(breakpoint);
 }
 
-void breakpoint_remove(struct target *target, uint32_t address)
+int breakpoint_remove_internal(struct target *target, uint32_t address)
 {
        struct breakpoint *breakpoint = target->breakpoints;
-       struct breakpoint **breakpoint_p = &target->breakpoints;
 
        while (breakpoint)
        {
-               if (breakpoint->address == address)
+               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))
                        break;
-               breakpoint_p = &breakpoint->next;
                breakpoint = breakpoint->next;
        }
 
        if (breakpoint)
        {
                breakpoint_free(target, breakpoint);
+               return 1;
        }
        else
        {
-               LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address);
+               if (!target->smp)
+                       LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address);
+               return 0;
        }
 }
+void breakpoint_remove(struct target *target, uint32_t address)
+{
+       int found = 0;
+       if (target->smp)
+       {
+               struct target_list *head;
+               struct target *curr;
+               head = target->head;
+               while(head != (struct target_list*)NULL)
+               {
+                       curr = head->target;
+                       found += breakpoint_remove_internal(curr, address);
+                       head = head->next;
+               }
+               if (found == 0)
+                       LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address);
+       }
+       else  breakpoint_remove_internal(target, address);
+}
 
-void breakpoint_clear_target(struct target *target)
+void breakpoint_clear_target_internal(struct target *target)
 {
        struct breakpoint *breakpoint;
 
@@ -165,6 +374,25 @@ void breakpoint_clear_target(struct target *target)
        }
 }
 
+void breakpoint_clear_target(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_clear_target_internal(curr);
+                       head = head->next;
+               }
+       }
+       else breakpoint_clear_target_internal(target);
+
+}
+
+
 struct breakpoint* breakpoint_find(struct target *target, uint32_t address)
 {
        struct breakpoint *breakpoint = target->breakpoints;
@@ -229,8 +457,8 @@ int watchpoint_add(struct target *target, uint32_t address, uint32_t length,
                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);
+                               watchpoint_rw_strings[(*watchpoint_p)->rw],
+                               address, reason);
                free (*watchpoint_p);
                *watchpoint_p = NULL;
                return retval;
@@ -241,12 +469,12 @@ bye:
                        watchpoint_rw_strings[(*watchpoint_p)->rw],
                        (*watchpoint_p)->address,
                        (*watchpoint_p)->length,
-                       (*watchpoint_p)->unique_id );
+                       (*watchpoint_p)->unique_id);
 
        return ERROR_OK;
 }
 
-static void watchpoint_free(struct target *target, struct watchpoint *watchpoint_remove)
+static void watchpoint_free(struct target *target, struct watchpoint *watchpoint_to_remove)
 {
        struct watchpoint *watchpoint = target->watchpoints;
        struct watchpoint **watchpoint_p = &target->watchpoints;
@@ -254,7 +482,7 @@ static void watchpoint_free(struct target *target, struct watchpoint *watchpoint
 
        while (watchpoint)
        {
-               if (watchpoint == watchpoint_remove)
+               if (watchpoint == watchpoint_to_remove)
                        break;
                watchpoint_p = &watchpoint->next;
                watchpoint = watchpoint->next;
@@ -271,13 +499,11 @@ static void watchpoint_free(struct target *target, struct watchpoint *watchpoint
 void watchpoint_remove(struct target *target, uint32_t address)
 {
        struct watchpoint *watchpoint = target->watchpoints;
-       struct watchpoint **watchpoint_p = &target->watchpoints;
 
        while (watchpoint)
        {
                if (watchpoint->address == address)
                        break;
-               watchpoint_p = &watchpoint->next;
                watchpoint = watchpoint->next;
        }
 
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)