X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fmips_m4k.c;h=0a566c3444175ee8df3f534f48270ecfd7033c8e;hp=6dd00ad5c1e1a1baf6476d09e10e5437be7d45fa;hb=71cde5e359f273585880ea8986709b950ba85b08;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 6dd00ad5c1..0a566c3444 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -23,10 +23,12 @@
 #include "config.h"
 #endif
 
+#include "breakpoints.h"
 #include "mips32.h"
 #include "mips_m4k.h"
 #include "mips32_dmaacc.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /* cli handling */
@@ -307,7 +309,7 @@ int mips_m4k_assert_reset(struct target *target)
 	target->state = TARGET_RESET;
 	jtag_add_sleep(50000);
 
-	mips32_invalidate_core_regs(target);
+	register_cache_invalidate(mips32->core_cache);
 
 	if (target->reset_halt)
 	{
@@ -408,7 +410,7 @@ int mips_m4k_resume(struct target *target, int current, uint32_t address, int ha
 	target->debug_reason = DBG_REASON_NOTHALTED;
 
 	/* registers are now invalid */
-	mips32_invalidate_core_regs(target);
+	register_cache_invalidate(mips32->core_cache);
 
 	if (!debug_execution)
 	{
@@ -465,7 +467,7 @@ int mips_m4k_step(struct target *target, int current, uint32_t address, int hand
 	mips_ejtag_exit_debug(ejtag_info);
 
 	/* registers are now invalid */
-	mips32_invalidate_core_regs(target);
+	register_cache_invalidate(mips32->core_cache);
 
 	if (breakpoint)
 		mips_m4k_set_breakpoint(target, breakpoint);
@@ -511,10 +513,9 @@ int mips_m4k_set_breakpoint(struct target *target, struct breakpoint *breakpoint
 			bp_num++;
 		if (bp_num >= mips32->num_inst_bpoints)
 		{
-			LOG_DEBUG("ERROR Can not find free FP Comparator(bpid: %d)",
+			LOG_ERROR("Can not find free FP Comparator(bpid: %d)",
 					  breakpoint->unique_id );
-			LOG_WARNING("ERROR Can not find free FP Comparator");
-			exit(-1);
+			return ERROR_FAIL;
 		}
 		breakpoint->set = bp_num + 1;
 		comparator_list[bp_num].used = 1;
@@ -722,9 +723,8 @@ int mips_m4k_set_watchpoint(struct target *target, struct watchpoint *watchpoint
 		wp_num++;
 	if (wp_num >= mips32->num_data_bpoints)
 	{
-		LOG_DEBUG("ERROR Can not find free FP Comparator");
-		LOG_WARNING("ERROR Can not find free FP Comparator");
-		exit(-1);
+		LOG_ERROR("Can not find free FP Comparator");
+		return ERROR_FAIL;
 	}
 
 	if (watchpoint->length != 4)