X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.c;h=637f681d7f4f284d68337ada46c93c03b2f906b5;hp=f2b6ff780e7683c6bb041b64b56f26a54aa66594;hb=57d7743639d5092770d79f7c4b12ae694c482750;hpb=0f1163e823c6ca3c2a81fa296157f5dde0635fea

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index f2b6ff780e..637f681d7f 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "target.h"
-#include "log.h"
+#include <helper/log.h>
 #include "breakpoints.h"
 
 
@@ -46,6 +46,7 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu
 {
 	struct breakpoint *breakpoint = target->breakpoints;
 	struct breakpoint **breakpoint_p = &target->breakpoints;
+	char *reason;
 	int retval;
 	int n;
 
@@ -53,7 +54,11 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu
 	while (breakpoint)
 	{
 		n++;
-		if (breakpoint->address == address){
+		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;
@@ -71,31 +76,24 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu
 	(*breakpoint_p)->next = NULL;
 	(*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 (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 (BPID: %d)",
-						 (*breakpoint_p)->unique_id );
-				free((*breakpoint_p)->orig_instr);
-				free(*breakpoint_p);
-				*breakpoint_p = NULL;
-				return retval;
-				break;
-			default:
-				break;
-		}
+	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)",
@@ -111,6 +109,7 @@ static void breakpoint_free(struct target *target, struct breakpoint *breakpoint
 {
 	struct breakpoint *breakpoint = target->breakpoints;
 	struct breakpoint **breakpoint_p = &target->breakpoints;
+	int retval;
 
 	while (breakpoint)
 	{
@@ -123,9 +122,9 @@ 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);
@@ -157,7 +156,9 @@ void breakpoint_remove(struct target *target, uint32_t address)
 void breakpoint_clear_target(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);
@@ -235,11 +236,12 @@ bye:
 		return retval;
 	}
 
-	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 );
+	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;
 }
@@ -248,6 +250,7 @@ static void watchpoint_free(struct target *target, struct watchpoint *watchpoint
 {
 	struct watchpoint *watchpoint = target->watchpoints;
 	struct watchpoint **watchpoint_p = &target->watchpoints;
+	int retval;
 
 	while (watchpoint)
 	{
@@ -259,8 +262,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);
 }
@@ -291,7 +294,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);