Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
breakpoint : indentation
[openocd.git] / src / target / breakpoints.c
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 80f98dc1101d72df063558e898b14bced1cb68f7..e722f67ef799e28baa00c170c142d3cca9729597 100644 (file)
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -63,7 +63,7 @@ int breakpoint_add_internal(struct target *target, uint32_t address, uint32_t le
                         * 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;
@@ -72,6 +72,7 @@ int breakpoint_add_internal(struct target *target, uint32_t address, uint32_t le
 
        (*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;
@@ -100,18 +101,129 @@ 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)
+       int retval = ERROR_OK;
+       if (target->smp)
        {
                struct target_list *head;
                struct target *curr;
@@ -121,12 +233,56 @@ int retval = ERROR_OK;
                        curr = head->target;
                        retval = breakpoint_add_internal(curr, address,length, type);
                        if (retval != ERROR_OK) return retval;
-                       head = head->next;      
+                       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(breakpoint_add_internal(target, address, length, type));
+               return(hybrid_breakpoint_add_internal(target, address, asid, length, type));
 
 }
 
@@ -159,13 +315,15 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint
 void 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;
        }
 
@@ -180,7 +338,7 @@ void breakpoint_remove_internal(struct target *target, uint32_t address)
 }
 void breakpoint_remove(struct target *target, uint32_t address)
 {
-    if ((target->smp))
+       if (target->smp)
        {
                struct target_list *head;
                struct target *curr;
@@ -189,7 +347,7 @@ void breakpoint_remove(struct target *target, uint32_t address)
                {
                        curr = head->target;
                        breakpoint_remove_internal(curr, address);
-                       head = head->next;      
+                       head = head->next;
                }
        }
        else  breakpoint_remove_internal(target, address);
@@ -209,7 +367,7 @@ void breakpoint_clear_target_internal(struct target *target)
 
 void breakpoint_clear_target(struct target *target)
 {
-    if (target->smp)
+       if (target->smp)
        {
                struct target_list *head;
                struct target *curr;
@@ -217,12 +375,12 @@ void breakpoint_clear_target(struct target *target)
                while(head != (struct target_list*)NULL)
                {
                        curr = head->target;
-                   breakpoint_clear_target_internal(curr);
-                       head = head->next;      
+                       breakpoint_clear_target_internal(curr);
+                       head = head->next;
                }
-     }
-        else breakpoint_clear_target_internal(target);
-       
+       }
+       else breakpoint_clear_target_internal(target);
+
 }
 
 
@@ -290,8 +448,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;
@@ -302,7 +460,7 @@ bye:
                        watchpoint_rw_strings[(*watchpoint_p)->rw],
                        (*watchpoint_p)->address,
                        (*watchpoint_p)->length,
-                       (*watchpoint_p)->unique_id );
+                       (*watchpoint_p)->unique_id);
 
        return ERROR_OK;
 }
@@ -332,13 +490,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)