X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.c;h=e6eb673893ba6c471b6327924efeac15c71060e7;hp=f52ff3067a11a9c83c4ad46e789c120326907141;hb=89fa8ce2d8c58707f3dfda397138f8ee336e1a47;hpb=995326b6000773efd454e308d487dec0b9f564b5

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index f52ff3067a..e6eb673893 100644
--- 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     *
@@ -21,228 +24,338 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-
-#include "binarybuffer.h"
 #include "target.h"
-#include "log.h"
-#include "types.h"
-
+#include <helper/log.h>
 #include "breakpoints.h"
 
-char *breakpoint_type_strings[] =
+
+static char *breakpoint_type_strings[] =
 {
 	"hardware",
 	"software"
 };
 
-char *watchpoint_rw_strings[] =
+static char *watchpoint_rw_strings[] =
 {
 	"read",
 	"write",
 	"access"
 };
 
-int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_type type)
+// monotonic counter/id-number for breakpoints and watch points
+static int bpwp_unique_id;
+
+int breakpoint_add_internal(struct target *target, uint32_t address, uint32_t length, enum breakpoint_type type)
 {
-	breakpoint_t *breakpoint = target->breakpoints;
-	breakpoint_t **breakpoint_p = &target->breakpoints;
+	struct breakpoint *breakpoint = target->breakpoints;
+	struct breakpoint **breakpoint_p = &target->breakpoints;
+	char *reason;
 	int retval;
-		
+	int n;
+
+	n = 0;
 	while (breakpoint)
 	{
-		if (breakpoint->address == address)
+		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 %d)",
+				  address, breakpoint->unique_id );
 			return ERROR_OK;
+		}
 		breakpoint_p = &breakpoint->next;
 		breakpoint = breakpoint->next;
 	}
-		
-	(*breakpoint_p) = malloc(sizeof(breakpoint_t));
+
+	(*breakpoint_p) = malloc(sizeof(struct breakpoint));
 	(*breakpoint_p)->address = address;
 	(*breakpoint_p)->length = length;
 	(*breakpoint_p)->type = type;
 	(*breakpoint_p)->set = 0;
 	(*breakpoint_p)->orig_instr = malloc(length);
 	(*breakpoint_p)->next = NULL;
-	
-	if ((retval = target->type->add_breakpoint(target, *breakpoint_p)) != ERROR_OK)
+	(*breakpoint_p)->unique_id = bpwp_unique_id++;
+
+	retval = target_add_breakpoint(target, *breakpoint_p);
+	switch (retval) {
+	case ERROR_OK:
+		break;
+	case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
+		reason = "resource not available";
+		goto fail;
+	case ERROR_TARGET_NOT_HALTED:
+		reason = "target running";
+		goto fail;
+	default:
+		reason = "unknown reason";
+fail:
+		LOG_ERROR("can't add breakpoint: %s", reason);
+		free((*breakpoint_p)->orig_instr);
+		free(*breakpoint_p);
+		*breakpoint_p = NULL;
+		return retval;
+	}
+
+	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  );
+
+	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)
 	{
-		switch (retval)
+		struct target_list *head;
+		struct target *curr;
+		head = target->head;
+		while(head != (struct target_list*)NULL)
 		{
-			case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-				INFO("can't add %s breakpoint, resource not available", breakpoint_type_strings[(*breakpoint_p)->type]);
-				free((*breakpoint_p)->orig_instr);
-				free(*breakpoint_p);
-				*breakpoint_p = NULL;
-				return retval;
-				break;
-			case ERROR_TARGET_NOT_HALTED:
-				INFO("can't add breakpoint while target is running");
-				free((*breakpoint_p)->orig_instr);
-				free(*breakpoint_p);
-				*breakpoint_p = NULL;
-				return retval;
-				break;
-			default:
-				ERROR("unknown error");
-				exit(-1);
-				break;
+			curr = head->target;
+			retval = breakpoint_add_internal(curr, address,length, type);
+			if (retval != ERROR_OK) return retval;
+			head = head->next;	
 		}
+		return retval;
 	}
-	
-	DEBUG("added %s breakpoint at 0x%8.8x of length 0x%8.8x", 
-		breakpoint_type_strings[(*breakpoint_p)->type],
-		(*breakpoint_p)->address, (*breakpoint_p)->length);
-	
-	return ERROR_OK;
+	else
+	return(breakpoint_add_internal(target, address, length, type));
+
 }
 
-int breakpoint_remove(target_t *target, u32 address)
+/* free up a breakpoint */
+static void breakpoint_free(struct target *target, struct breakpoint *breakpoint_to_remove)
 {
-	breakpoint_t *breakpoint = target->breakpoints;
-	breakpoint_t **breakpoint_p = &target->breakpoints;
+	struct breakpoint *breakpoint = target->breakpoints;
+	struct breakpoint **breakpoint_p = &target->breakpoints;
 	int retval;
-	
+
 	while (breakpoint)
 	{
-		if (breakpoint->address == address)
+		if (breakpoint == breakpoint_to_remove)
 			break;
 		breakpoint_p = &breakpoint->next;
 		breakpoint = breakpoint->next;
 	}
-	
+
+	if (breakpoint == NULL)
+		return;
+
+	retval = target_remove_breakpoint(target, breakpoint);
+
+	LOG_DEBUG("free BPID: %d --> %d", breakpoint->unique_id, retval);
+	(*breakpoint_p) = breakpoint->next;
+	free(breakpoint->orig_instr);
+	free(breakpoint);
+}
+
+void breakpoint_remove_internal(struct target *target, uint32_t address)
+{
+	struct breakpoint *breakpoint = target->breakpoints;
+
+	while (breakpoint)
+	{
+		if (breakpoint->address == address)
+			break;
+		breakpoint = breakpoint->next;
+	}
+
 	if (breakpoint)
 	{
-		if ((retval = target->type->remove_breakpoint(target, breakpoint)) != ERROR_OK)
+		breakpoint_free(target, breakpoint);
+	}
+	else
+	{
+		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)
 		{
-			switch (retval)
-			{
-				case ERROR_TARGET_NOT_HALTED:
-					INFO("can't remove breakpoint while target is running");
-					return retval;
-					break;
-				default:
-					ERROR("unknown error");
-					exit(-1);
-					break;
-			}
+			curr = head->target;
+			breakpoint_remove_internal(curr, address);
+			head = head->next;	
 		}
-		(*breakpoint_p) = breakpoint->next;
-		free(breakpoint->orig_instr);
-		free(breakpoint);
 	}
-	else
+	else  breakpoint_remove_internal(target, address);
+}
+
+void breakpoint_clear_target_internal(struct target *target)
+{
+	struct breakpoint *breakpoint;
+
+	LOG_DEBUG("Delete all breakpoints for target: %s",
+			target_name(target));
+	while ((breakpoint = target->breakpoints) != NULL)
 	{
-		ERROR("no breakpoint at address 0x%8.8x found", address);
+		breakpoint_free(target, breakpoint);
 	}
-	
-	return ERROR_OK;
 }
 
-breakpoint_t* breakpoint_find(target_t *target, u32 address)
+void breakpoint_clear_target(struct target *target)
 {
-	breakpoint_t *breakpoint = target->breakpoints;
+    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;
+
 	while (breakpoint)
 	{
 		if (breakpoint->address == address)
 			return breakpoint;
 		breakpoint = breakpoint->next;
 	}
-	
+
 	return NULL;
 }
 
-int watchpoint_add(target_t *target, u32 address, u32 length, enum watchpoint_rw rw, u32 value, u32 mask)
+int watchpoint_add(struct target *target, uint32_t address, uint32_t length,
+		enum watchpoint_rw rw, uint32_t value, uint32_t mask)
 {
-	watchpoint_t *watchpoint = target->watchpoints;
-	watchpoint_t **watchpoint_p = &target->watchpoints;
+	struct watchpoint *watchpoint = target->watchpoints;
+	struct watchpoint **watchpoint_p = &target->watchpoints;
 	int retval;
-		
+	char *reason;
+
 	while (watchpoint)
 	{
-		if (watchpoint->address == address)
+		if (watchpoint->address == address) {
+			if (watchpoint->length != length
+					|| watchpoint->value != value
+					|| watchpoint->mask != mask
+					|| watchpoint->rw != rw) {
+				LOG_ERROR("address 0x%8.8" PRIx32
+						"already has watchpoint %d",
+						address, watchpoint->unique_id);
+				return ERROR_FAIL;
+			}
+
+			/* ignore duplicate watchpoint */
 			return ERROR_OK;
+		}
 		watchpoint_p = &watchpoint->next;
 		watchpoint = watchpoint->next;
 	}
-	
-	(*watchpoint_p) = malloc(sizeof(watchpoint_t));
+
+	(*watchpoint_p) = calloc(1, sizeof(struct watchpoint));
 	(*watchpoint_p)->address = address;
 	(*watchpoint_p)->length = length;
 	(*watchpoint_p)->value = value;
 	(*watchpoint_p)->mask = mask;
 	(*watchpoint_p)->rw = rw;
-	(*watchpoint_p)->set = 0;
-	(*watchpoint_p)->next = NULL;
-		
-	if ((retval = target->type->add_watchpoint(target, *watchpoint_p)) != ERROR_OK)
-	{
-		switch (retval)
-		{
-			case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-				INFO("can't add %s watchpoint, resource not available", watchpoint_rw_strings[(*watchpoint_p)->rw]);
-				free (*watchpoint_p);
-				*watchpoint_p = NULL;
-				return retval;
-				break;
-			case ERROR_TARGET_NOT_HALTED:
-				INFO("can't add watchpoint while target is running");
-				free (*watchpoint_p);
-				*watchpoint_p = NULL;
-				return retval;
-				break;
-			default:
-				ERROR("unknown error");
-				exit(-1);
-				break;
-		}
+	(*watchpoint_p)->unique_id = bpwp_unique_id++;
+
+	retval = target_add_watchpoint(target, *watchpoint_p);
+	switch (retval) {
+	case ERROR_OK:
+		break;
+	case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
+		reason = "resource not available";
+		goto bye;
+	case ERROR_TARGET_NOT_HALTED:
+		reason = "target running";
+		goto bye;
+	default:
+		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);
+		free (*watchpoint_p);
+		*watchpoint_p = NULL;
+		return retval;
 	}
-	
-	DEBUG("added %s watchpoint at 0x%8.8x of length 0x%8.8x",
-		watchpoint_rw_strings[(*watchpoint_p)->rw],
-		(*watchpoint_p)->address, (*watchpoint_p)->length);
-	
+
+	LOG_DEBUG("added %s watchpoint at 0x%8.8" PRIx32
+			" of length 0x%8.8" PRIx32 " (WPID: %d)",
+			watchpoint_rw_strings[(*watchpoint_p)->rw],
+			(*watchpoint_p)->address,
+			(*watchpoint_p)->length,
+			(*watchpoint_p)->unique_id );
+
 	return ERROR_OK;
 }
 
-int watchpoint_remove(target_t *target, u32 address)
+static void watchpoint_free(struct target *target, struct watchpoint *watchpoint_to_remove)
 {
-	watchpoint_t *watchpoint = target->watchpoints;
-	watchpoint_t **watchpoint_p = &target->watchpoints;
+	struct watchpoint *watchpoint = target->watchpoints;
+	struct watchpoint **watchpoint_p = &target->watchpoints;
 	int retval;
-	
+
 	while (watchpoint)
 	{
-		if (watchpoint->address == address)
+		if (watchpoint == watchpoint_to_remove)
 			break;
 		watchpoint_p = &watchpoint->next;
 		watchpoint = watchpoint->next;
 	}
-	
+
+	if (watchpoint == NULL)
+		return;
+	retval = target_remove_watchpoint(target, watchpoint);
+	LOG_DEBUG("free WPID: %d --> %d", watchpoint->unique_id, retval);
+	(*watchpoint_p) = watchpoint->next;
+	free(watchpoint);
+}
+
+void watchpoint_remove(struct target *target, uint32_t address)
+{
+	struct watchpoint *watchpoint = target->watchpoints;
+
+	while (watchpoint)
+	{
+		if (watchpoint->address == address)
+			break;
+		watchpoint = watchpoint->next;
+	}
+
 	if (watchpoint)
 	{
-		if ((retval = target->type->remove_watchpoint(target, watchpoint)) != ERROR_OK)
-		{
-			switch (retval)
-			{
-				case ERROR_TARGET_NOT_HALTED:
-					INFO("can't remove watchpoint while target is running");
-					return retval;
-					break;
-				default:
-					ERROR("unknown error");
-					exit(-1);
-					break;
-			}
-		}
-		(*watchpoint_p) = watchpoint->next;
-		free(watchpoint);
+		watchpoint_free(target, watchpoint);
 	}
 	else
 	{
-		ERROR("no watchpoint at address 0x%8.8x found", address);
+		LOG_ERROR("no watchpoint at address 0x%8.8" PRIx32 " found", address);
+	}
+}
+
+void watchpoint_clear_target(struct target *target)
+{
+	struct watchpoint *watchpoint;
+
+	LOG_DEBUG("Delete all watchpoints for target: %s",
+			target_name(target));
+	while ((watchpoint = target->watchpoints) != NULL)
+	{
+		watchpoint_free(target, watchpoint);
 	}
-	
-	return ERROR_OK;
 }