Fix "unused variable" warnings (errors) detected with GCC 4.7.0 - trivial fixes

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

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 3ab1464e8b8db27dab7eb2f3cb9f6cd830598fe1..e6eb673893ba6c471b6327924efeac15c71060e7 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     *
@@ -22,7 +25,7 @@
 #endif
 
 #include "target.h"
-#include "log.h"
+#include <helper/log.h>
 #include "breakpoints.h"
 
 
@@ -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;
@@ -104,15 +107,39 @@ fail:
        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;
+               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));
+
+}
+
 /* 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;
+       int retval;
 
        while (breakpoint)
        {
-               if (breakpoint == breakpoint_remove)
+               if (breakpoint == breakpoint_to_remove)
                        break;
                breakpoint_p = &breakpoint->next;
                breakpoint = breakpoint->next;
@@ -121,24 +148,22 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint
        if (breakpoint == NULL)
                return;
 
-       target_remove_breakpoint(target, breakpoint);
+       retval = target_remove_breakpoint(target, breakpoint);
 
-       LOG_DEBUG("BPID: %d", breakpoint->unique_id );
+       LOG_DEBUG("free BPID: %d --> %d", breakpoint->unique_id, retval);
        (*breakpoint_p) = breakpoint->next;
        free(breakpoint->orig_instr);
        free(breakpoint);
 }
 
-void breakpoint_remove(struct target *target, uint32_t address)
+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)
                        break;
-               breakpoint_p = &breakpoint->next;
                breakpoint = breakpoint->next;
        }
 
@@ -151,17 +176,54 @@ void breakpoint_remove(struct target *target, uint32_t address)
                LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address);
        }
 }
+void breakpoint_remove(struct target *target, uint32_t address)
+{
+    if ((target->smp))
+       {
+               struct target_list *head;
+               struct target *curr;
+               head = target->head;
+               while(head != (struct target_list*)NULL)
+               {
+                       curr = head->target;
+                       breakpoint_remove_internal(curr, address);
+                       head = head->next;      
+               }
+       }
+       else  breakpoint_remove_internal(target, address);
+}
 
-void breakpoint_clear_target(struct target *target)
+void breakpoint_clear_target_internal(struct target *target)
 {
        struct breakpoint *breakpoint;
-       LOG_DEBUG("Delete all breakpoints for target: %s", target_get_name( target ));
+
+       LOG_DEBUG("Delete all breakpoints for target: %s",
+                       target_name(target));
        while ((breakpoint = target->breakpoints) != NULL)
        {
                breakpoint_free(target, breakpoint);
        }
 }
 
+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;
@@ -243,14 +305,15 @@ bye:
        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;
+       int retval;
 
        while (watchpoint)
        {
-               if (watchpoint == watchpoint_remove)
+               if (watchpoint == watchpoint_to_remove)
                        break;
                watchpoint_p = &watchpoint->next;
                watchpoint = watchpoint->next;
@@ -258,8 +321,8 @@ static void watchpoint_free(struct target *target, struct watchpoint *watchpoint
 
        if (watchpoint == NULL)
                return;
-       target_remove_watchpoint(target, watchpoint);
-       LOG_DEBUG("WPID: %d", watchpoint->unique_id );
+       retval = target_remove_watchpoint(target, watchpoint);
+       LOG_DEBUG("free WPID: %d --> %d", watchpoint->unique_id, retval);
        (*watchpoint_p) = watchpoint->next;
        free(watchpoint);
 }
@@ -267,13 +330,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;
        }
 
@@ -290,7 +351,9 @@ void watchpoint_remove(struct target *target, uint32_t address)
 void watchpoint_clear_target(struct target *target)
 {
        struct watchpoint *watchpoint;
-       LOG_DEBUG("Delete all watchpoints for target: %s", target_get_name( target ));
+
+       LOG_DEBUG("Delete all watchpoints for target: %s",
+                       target_name(target));
        while ((watchpoint = target->watchpoints) != NULL)
        {
                watchpoint_free(target, watchpoint);