More cleanup.

Change-Id: I804bdcec23b69d77dfc376e23c6d1f29f99e7335

src/rtos/rtos.c

@@ -432,7 +432,6 @@ int rtos_thread_packet(struct connection *connection, char const *packet, int pa
 				target->rtos->current_threadid = target->rtos->current_thread;
 			else
 				target->rtos->current_threadid = threadid;
-			LOG_DEBUG("current_threadid=%ld", target->rtos->current_threadid);
 		}
 		gdb_put_packet(connection, "OK", 2);
 		return ERROR_OK;
@@ -517,7 +516,6 @@ int rtos_get_gdb_reg_list(struct connection *connection)
 {
 	struct target *target = get_target_from_connection(connection);
 	int64_t current_threadid = target->rtos->current_threadid;
-	LOG_DEBUG("current_threadid=%ld", target->rtos->current_threadid);
 	if ((target->rtos != NULL) && (current_threadid != -1) &&
 			(current_threadid != 0) &&
 			((current_threadid != target->rtos->current_thread) ||

src/server/gdb_server.c

@@ -96,7 +96,7 @@ struct gdb_connection {
 	char *thread_list;
 };
 
-#if 1
+#if 0
 #define _DEBUG_GDB_IO_
 #endif
 
@@ -736,7 +736,7 @@ static void gdb_signal_reply(struct target *target, struct connection *connectio
 		struct target *ct;
 		if (target->rtos != NULL) {
 			target->rtos->current_threadid = target->rtos->current_thread;
-			LOG_DEBUG("current_threadid=%ld", target->rtos->current_threadid);
+			LOG_DEBUG("current_threadid=%" PRId64, target->rtos->current_threadid);
 			target->rtos->gdb_target_for_threadid(connection, target->rtos->current_threadid, &ct);
 		} else {
 			ct = target;

src/target/breakpoints.c

@@ -549,8 +549,6 @@ int watchpoint_hit(struct target *target, enum watchpoint_rw *rw,
 	int retval;
 	struct watchpoint *hit_watchpoint;
 
-	LOG_DEBUG("[%d]", target->coreid);
-
 	retval = target_hit_watchpoint(target, &hit_watchpoint);
 	if (retval != ERROR_OK)
 		return ERROR_FAIL;

src/target/riscv/riscv.c

@@ -648,33 +648,12 @@ static void trigger_from_watchpoint(struct trigger *trigger,
 
 int riscv_add_watchpoint(struct target *target, struct watchpoint *watchpoint)
 {
-	LOG_DEBUG("[%d] @0x%" TARGET_PRIxADDR, target->coreid, watchpoint->address);
 	struct trigger trigger;
 	trigger_from_watchpoint(&trigger, watchpoint);
 
-	if (target->smp) {
+	int result = add_trigger(target, &trigger);
-		struct target *failed = NULL;
+	if (result != ERROR_OK)
-		for (struct target_list *list = target->head; list != NULL;
+		return result;
-				list = list->next) {
-			struct target *t = list->target;
-			if (add_trigger(t, &trigger) != ERROR_OK) {
-				failed = t;
-				break;
-			}
-		}
-		if (failed) {
-			for (struct target_list *list = target->head;
-					list->target != failed; list = list->next) {
-				struct target *t = list->target;
-				remove_trigger(t, &trigger);
-			}
-			return ERROR_FAIL;
-		}
-	} else {
-		int result = add_trigger(target, &trigger);
-		if (result != ERROR_OK)
-			return result;
-	}
 	watchpoint->set = true;
 
 	return ERROR_OK;
@@ -688,21 +667,9 @@ int riscv_remove_watchpoint(struct target *target,
 	struct trigger trigger;
 	trigger_from_watchpoint(&trigger, watchpoint);
 
-	if (target->smp) {
+	int result = remove_trigger(target, &trigger);
-		bool failed = false;
+	if (result != ERROR_OK)
-		for (struct target_list *list = target->head; list != NULL;
+		return result;
-				list = list->next) {
-			struct target *t = list->target;
-			if (remove_trigger(t, &trigger) != ERROR_OK)
-				failed = true;
-		}
-		if (failed)
-			return ERROR_FAIL;
-	} else {
-		int result = remove_trigger(target, &trigger);
-		if (result != ERROR_OK)
-			return result;
-	}
 	watchpoint->set = false;
 
 	return ERROR_OK;

src/target/target.c

@@ -1206,8 +1206,6 @@ int target_hit_watchpoint(struct target *target,
 		return ERROR_FAIL;
 	}
 
-	LOG_DEBUG("[%d]", target->coreid);
-
 	return target->type->hit_watchpoint(target, hit_watchpoint);
 }