X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.c;h=fd121f2fee00373a2c1a187cd64106b7e2c099d5;hb=0cba0d4df3fe120f08945703506f8405760325c9;hp=ac8d7dfd6e773d21b8f3d057ac00db4744d8ed78;hpb=8c290412d28f9eef568dac0cfc20ccd4a9eca4d5;p=openocd.git

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index ac8d7dfd6e..fd121f2fee 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -48,7 +48,7 @@ int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_ty
 	breakpoint_t *breakpoint = target->breakpoints;
 	breakpoint_t **breakpoint_p = &target->breakpoints;
 	int retval;
-		
+	
 	while (breakpoint)
 	{
 		if (breakpoint->address == address)
@@ -62,7 +62,7 @@ int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_ty
 	(*breakpoint_p)->length = length;
 	(*breakpoint_p)->type = type;
 	(*breakpoint_p)->set = 0;
-	(*breakpoint_p)->orig_instr = malloc(CEIL(length, 8));
+	(*breakpoint_p)->orig_instr = malloc(length);
 	(*breakpoint_p)->next = NULL;
 	
 	if ((retval = target->type->add_breakpoint(target, *breakpoint_p)) != ERROR_OK)
@@ -70,38 +70,59 @@ int breakpoint_add(target_t *target, u32 address, u32 length, enum breakpoint_ty
 		switch (retval)
 		{
 			case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-				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", 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");
+				LOG_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;
 		}
 	}
 	
-	DEBUG("added %s breakpoint at 0x%8.8x of length 0x%8.8x", 
+	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);
 	
 	return ERROR_OK;
 }
 
-int breakpoint_remove(target_t *target, u32 address)
+/* free up a breakpoint */
+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)
+			break;
+		breakpoint_p = &breakpoint->next;
+		breakpoint = breakpoint->next;
+	}
+	
+	if (breakpoint==NULL)
+		return;
+	
+	target->type->remove_breakpoint(target, breakpoint);
+	
+	(*breakpoint_p) = breakpoint->next;
+	free(breakpoint->orig_instr);
+	free(breakpoint);
+}
+
+void breakpoint_remove(target_t *target, u32 address)
 {
 	breakpoint_t *breakpoint = target->breakpoints;
 	breakpoint_t **breakpoint_p = &target->breakpoints;
-	int retval;
 	
 	while (breakpoint)
 	{
@@ -113,30 +134,21 @@ int breakpoint_remove(target_t *target, u32 address)
 	
 	if (breakpoint)
 	{
-		if ((retval = target->type->remove_breakpoint(target, breakpoint)) != ERROR_OK)
-		{
-			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;
-			}
-		}
-		(*breakpoint_p) = breakpoint->next;
-		free(breakpoint->orig_instr);
-		free(breakpoint);
+		breakpoint_free(target, breakpoint);
 	}
 	else
 	{
-		ERROR("no breakpoint at address 0x%8.8x found", address);
+		LOG_ERROR("no breakpoint at address 0x%8.8x found", address);
+	}
+}
+
+void breakpoint_clear_target(target_t *target)
+{
+	breakpoint_t *breakpoint;
+	while ((breakpoint = target->breakpoints)!=NULL)
+	{
+		breakpoint_free(target, breakpoint);
 	}
-	
-	return ERROR_OK;
 }
 
 breakpoint_t* breakpoint_find(target_t *target, u32 address)
@@ -181,36 +193,55 @@ int watchpoint_add(target_t *target, u32 address, u32 length, enum watchpoint_rw
 		switch (retval)
 		{
 			case ERROR_TARGET_RESOURCE_NOT_AVAILABLE:
-				INFO("can't add %s watchpoint, resource not available", watchpoint_rw_strings[(*watchpoint_p)->rw]);
+				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:
-				INFO("can't add watchpoint while target is running");
+				LOG_INFO("can't add watchpoint while target is running");
 				free (*watchpoint_p);
 				*watchpoint_p = NULL;
 				return retval;
 				break;
 			default:
-				ERROR("unknown error");
+				LOG_ERROR("unknown error");
 				exit(-1);
 				break;
 		}
 	}
 	
-	DEBUG("added %s watchpoint at 0x%8.8x of length 0x%8.8x",
+	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);
 	
 	return ERROR_OK;
 }
 
-int watchpoint_remove(target_t *target, u32 address)
+static void watchpoint_free(target_t *target, watchpoint_t *watchpoint_remove)
+{
+	watchpoint_t *watchpoint = target->watchpoints;
+	watchpoint_t **watchpoint_p = &target->watchpoints;
+
+	while (watchpoint)
+	{
+		if (watchpoint == watchpoint_remove)
+			break;
+		watchpoint_p = &watchpoint->next;
+		watchpoint = watchpoint->next;
+	}
+	
+	if (watchpoint==NULL)
+		return;
+	target->type->remove_watchpoint(target, watchpoint);
+	(*watchpoint_p) = watchpoint->next;
+	free(watchpoint);
+}
+
+void watchpoint_remove(target_t *target, u32 address)
 {
 	watchpoint_t *watchpoint = target->watchpoints;
 	watchpoint_t **watchpoint_p = &target->watchpoints;
-	int retval;
 	
 	while (watchpoint)
 	{
@@ -222,18 +253,19 @@ int watchpoint_remove(target_t *target, u32 address)
 	
 	if (watchpoint)
 	{
-		if ((retval = target->type->remove_watchpoint(target, watchpoint)) != ERROR_OK)
-		{
-			ERROR("BUG: can't remove watchpoint");
-			exit(-1);
-		}
-		(*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.8x found", address);
+	}
+}
+
+void watchpoint_clear_target(target_t *target)
+{
+	watchpoint_t *watchpoint;
+	while ((watchpoint = target->watchpoints)!=NULL)
+	{
+		watchpoint_free(target, watchpoint);
 	}
-	
-	return ERROR_OK;
 }