X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.c;h=dd672b9fef22d6aebd340a05054aa5cc600728e1;hp=4a949cca700c1e7a29aab5673a5b7548e241a9df;hb=a9abfa7d06dbcfded97b7fb41f50d3581c24fbae;hpb=a71ca65c53b4854e11363b16aea0db3ca149b5a8

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 4a949cca70..dd672b9fef 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -21,42 +21,47 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-
-#include "binarybuffer.h"
 #include "target.h"
 #include "log.h"
-#include "types.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(target_t *target, uint32_t address, uint32_t length, enum breakpoint_type type)
 {
 	breakpoint_t *breakpoint = target->breakpoints;
 	breakpoint_t **breakpoint_p = &target->breakpoints;
 	int retval;
-	
+	int n;
+
+	n = 0;
 	while (breakpoint)
 	{
-		if (breakpoint->address == address)
+		n++;
+		if (breakpoint->address == address){
+			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)->address = address;
 	(*breakpoint_p)->length = length;
@@ -64,20 +69,25 @@ int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_ty
 	(*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++;
+
+	if ((retval = target_add_breakpoint(target, *breakpoint_p)) != ERROR_OK)
 	{
 		switch (retval)
 		{
 			case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-				LOG_INFO("can't add %s breakpoint, resource not available", breakpoint_type_strings[(*breakpoint_p)->type]);
+				LOG_INFO("can't add %s breakpoint, resource not available (BPID=%d)",
+					 breakpoint_type_strings[(*breakpoint_p)->type],
+					 (*breakpoint_p)->unique_id );
+
 				free((*breakpoint_p)->orig_instr);
 				free(*breakpoint_p);
 				*breakpoint_p = NULL;
 				return retval;
 				break;
 			case ERROR_TARGET_NOT_HALTED:
-				LOG_INFO("can't add breakpoint while target is running");
+				LOG_INFO("can't add breakpoint while target is running (BPID: %d)",
+						 (*breakpoint_p)->unique_id );
 				free((*breakpoint_p)->orig_instr);
 				free(*breakpoint_p);
 				*breakpoint_p = NULL;
@@ -87,11 +97,12 @@ int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_ty
 				break;
 		}
 	}
-	
-	LOG_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);
-	
+
+	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;
 }
 
@@ -100,30 +111,31 @@ static void breakpoint_free(target_t *target, breakpoint_t *breakpoint_remove)
 {
 	breakpoint_t *breakpoint = target->breakpoints;
 	breakpoint_t **breakpoint_p = &target->breakpoints;
-	
+
 	while (breakpoint)
 	{
-		if (breakpoint==breakpoint_remove)
+		if (breakpoint == breakpoint_remove)
 			break;
 		breakpoint_p = &breakpoint->next;
 		breakpoint = breakpoint->next;
 	}
-	
-	if (breakpoint==NULL)
+
+	if (breakpoint == NULL)
 		return;
-	
-	target->type->remove_breakpoint(target, breakpoint);
-	
+
+	target_remove_breakpoint(target, breakpoint);
+
+	LOG_DEBUG("BPID: %d", breakpoint->unique_id );
 	(*breakpoint_p) = breakpoint->next;
 	free(breakpoint->orig_instr);
 	free(breakpoint);
 }
 
-int breakpoint_remove(target_t *target, u32 address)
+void breakpoint_remove(target_t *target, uint32_t address)
 {
 	breakpoint_t *breakpoint = target->breakpoints;
 	breakpoint_t **breakpoint_p = &target->breakpoints;
-	
+
 	while (breakpoint)
 	{
 		if (breakpoint->address == address)
@@ -131,92 +143,104 @@ int breakpoint_remove(target_t *target, u32 address)
 		breakpoint_p = &breakpoint->next;
 		breakpoint = breakpoint->next;
 	}
-	
+
 	if (breakpoint)
 	{
 		breakpoint_free(target, breakpoint);
 	}
 	else
 	{
-		LOG_ERROR("no breakpoint at address 0x%8.8x found", address);
+		LOG_ERROR("no breakpoint at address 0x%8.8" PRIx32 " found", address);
 	}
-	
-	return ERROR_OK;
 }
 
 void breakpoint_clear_target(target_t *target)
 {
 	breakpoint_t *breakpoint;
-	while ((breakpoint = target->breakpoints)!=NULL)
+	LOG_DEBUG("Delete all breakpoints for target: %s", target_get_name( target ));
+	while ((breakpoint = target->breakpoints) != NULL)
 	{
 		breakpoint_free(target, breakpoint);
 	}
 }
 
-breakpoint_t* breakpoint_find(target_t *target, u32 address)
+breakpoint_t* breakpoint_find(target_t *target, uint32_t address)
 {
 	breakpoint_t *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(target_t *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;
 	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(watchpoint_t));
 	(*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:
-				LOG_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:
-				LOG_INFO("can't add watchpoint while target is running");
-				free (*watchpoint_p);
-				*watchpoint_p = NULL;
-				return retval;
-				break;
-			default:
-				LOG_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;
 	}
-	
-	LOG_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.8x (WPID: %d)",
+			  watchpoint_rw_strings[(*watchpoint_p)->rw],
+			  (*watchpoint_p)->address,
+			  (*watchpoint_p)->length,
+			  (*watchpoint_p)->unique_id );
+
 	return ERROR_OK;
 }
 
@@ -232,21 +256,20 @@ static void watchpoint_free(target_t *target, watchpoint_t *watchpoint_remove)
 		watchpoint_p = &watchpoint->next;
 		watchpoint = watchpoint->next;
 	}
-	
-	if (watchpoint==NULL)
+
+	if (watchpoint == NULL)
 		return;
-	target->type->remove_watchpoint(target, watchpoint);
+	target_remove_watchpoint(target, watchpoint);
+	LOG_DEBUG("WPID: %d", watchpoint->unique_id );
 	(*watchpoint_p) = watchpoint->next;
 	free(watchpoint);
 }
 
-
-
-int watchpoint_remove(target_t *target, u32 address)
+void watchpoint_remove(target_t *target, uint32_t address)
 {
 	watchpoint_t *watchpoint = target->watchpoints;
 	watchpoint_t **watchpoint_p = &target->watchpoints;
-	
+
 	while (watchpoint)
 	{
 		if (watchpoint->address == address)
@@ -254,24 +277,22 @@ int watchpoint_remove(target_t *target, u32 address)
 		watchpoint_p = &watchpoint->next;
 		watchpoint = watchpoint->next;
 	}
-	
+
 	if (watchpoint)
 	{
 		watchpoint_free(target, watchpoint);
 	}
 	else
 	{
-		LOG_ERROR("no watchpoint at address 0x%8.8x found", address);
+		LOG_ERROR("no watchpoint at address 0x%8.8" PRIx32 " found", address);
 	}
-	
-	return ERROR_OK;
 }
 
-
 void watchpoint_clear_target(target_t *target)
 {
 	watchpoint_t *watchpoint;
-	while ((watchpoint = target->watchpoints)!=NULL)
+	LOG_DEBUG("Delete all watchpoints for target: %s", target_get_name( target ));
+	while ((watchpoint = target->watchpoints) != NULL)
 	{
 		watchpoint_free(target, watchpoint);
 	}