X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.c;h=917dfc7897cf0aa4c6fc4873f7c4054572a7b211;hb=9e3d43cfe75df7c4f6797d630576f1a02428b218;hp=df797e3774017531cc83937fce25f87646f1971d;hpb=b715a81f5b95144118d8f946d4191f1dc844783a;p=openocd.git

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index df797e3774..917dfc7897 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,7 +46,6 @@ 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;
 
@@ -77,19 +76,9 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu
 	(*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);
+	if (retval != ERROR_OK)
+	{
+		LOG_ERROR("could not add breakpoint");
 		free((*breakpoint_p)->orig_instr);
 		free(*breakpoint_p);
 		*breakpoint_p = NULL;
@@ -105,14 +94,15 @@ fail:
 }
 
 /* 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,9 +111,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 +147,7 @@ void breakpoint_clear_target(struct target *target)
 	struct breakpoint *breakpoint;
 
 	LOG_DEBUG("Delete all breakpoints for target: %s",
-			target_type_name(target));
+			target_name(target));
 	while ((breakpoint = target->breakpoints) != NULL)
 	{
 		breakpoint_free(target, breakpoint);
@@ -184,7 +174,6 @@ int watchpoint_add(struct target *target, uint32_t address, uint32_t length,
 	struct watchpoint *watchpoint = target->watchpoints;
 	struct watchpoint **watchpoint_p = &target->watchpoints;
 	int retval;
-	char *reason;
 
 	while (watchpoint)
 	{
@@ -215,21 +204,11 @@ int watchpoint_add(struct target *target, uint32_t address, uint32_t length,
 	(*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",
+	if (retval != ERROR_OK)
+	{
+		LOG_ERROR("can't add %s watchpoint at 0x%8.8" PRIx32,
 			 watchpoint_rw_strings[(*watchpoint_p)->rw],
-			 address, reason);
+			 address);
 		free (*watchpoint_p);
 		*watchpoint_p = NULL;
 		return retval;
@@ -245,14 +224,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;
@@ -260,8 +240,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);
 }
@@ -294,7 +274,7 @@ void watchpoint_clear_target(struct target *target)
 	struct watchpoint *watchpoint;
 
 	LOG_DEBUG("Delete all watchpoints for target: %s",
-			target_type_name(target));
+			target_name(target));
 	while ((watchpoint = target->watchpoints) != NULL)
 	{
 		watchpoint_free(target, watchpoint);