X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fcortex_m3.c;h=7e48dae19de18451b6c492853a1f38ac923a3500;hp=bb0b0c416be85b5d582ee8ab37842d4346f9996a;hb=47f2305229486f14eed948025c21c6ab73471d4e;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34

diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index bb0b0c416b..7e48dae19d 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -31,18 +31,18 @@
 #include "config.h"
 #endif
 
+#include "breakpoints.h"
 #include "cortex_m3.h"
 #include "target_request.h"
 #include "target_type.h"
 #include "arm_disassembler.h"
+#include "register.h"
 
 
 /* NOTE:  most of this should work fine for the Cortex-M1 and
  * Cortex-M0 cores too, although they're ARMv6-M not ARMv7-M.
  */
 
-#define ARRAY_SIZE(x)	((int)(sizeof(x)/sizeof((x)[0])))
-
 
 /* forward declarations */
 static int cortex_m3_set_breakpoint(struct target *target, struct breakpoint *breakpoint);
@@ -858,9 +858,8 @@ cortex_m3_set_breakpoint(struct target *target, struct breakpoint *breakpoint)
 			fp_num++;
 		if (fp_num >= cortex_m3->fp_num_code)
 		{
-			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 FPB Comparator!");
+			return ERROR_FAIL;
 		}
 		breakpoint->set = fp_num + 1;
 		hilo = (breakpoint->address & 0x2) ? FPCR_REPLACE_BKPT_HIGH : FPCR_REPLACE_BKPT_LOW;
@@ -1372,16 +1371,11 @@ static int cortex_m3_read_memory(struct target *target, uint32_t address,
 {
 	struct armv7m_common *armv7m = target_to_armv7m(target);
 	struct swjdp_common *swjdp = &armv7m->swjdp_info;
-	int retval;
-
-	/* sanitize arguments */
-	if (((size != 4) && (size != 2) && (size != 1)) || (count == 0) || !(buffer))
-		return ERROR_INVALID_ARGUMENTS;
+	int retval = ERROR_INVALID_ARGUMENTS;
 
 	/* cortex_m3 handles unaligned memory access */
-
-	switch (size)
-	{
+	if (count && buffer) {
+		switch (size) {
 		case 4:
 			retval = mem_ap_read_buf_u32(swjdp, buffer, 4 * count, address);
 			break;
@@ -1391,9 +1385,7 @@ static int cortex_m3_read_memory(struct target *target, uint32_t address,
 		case 1:
 			retval = mem_ap_read_buf_u8(swjdp, buffer, count, address);
 			break;
-		default:
-			LOG_ERROR("BUG: we shouldn't get here");
-			exit(-1);
+		}
 	}
 
 	return retval;
@@ -1404,14 +1396,10 @@ static int cortex_m3_write_memory(struct target *target, uint32_t address,
 {
 	struct armv7m_common *armv7m = target_to_armv7m(target);
 	struct swjdp_common *swjdp = &armv7m->swjdp_info;
-	int retval;
-
-	/* sanitize arguments */
-	if (((size != 4) && (size != 2) && (size != 1)) || (count == 0) || !(buffer))
-		return ERROR_INVALID_ARGUMENTS;
+	int retval = ERROR_INVALID_ARGUMENTS;
 
-	switch (size)
-	{
+	if (count && buffer) {
+		switch (size) {
 		case 4:
 			retval = mem_ap_write_buf_u32(swjdp, buffer, 4 * count, address);
 			break;
@@ -1421,9 +1409,7 @@ static int cortex_m3_write_memory(struct target *target, uint32_t address,
 		case 1:
 			retval = mem_ap_write_buf_u8(swjdp, buffer, count, address);
 			break;
-		default:
-			LOG_ERROR("BUG: we shouldn't get here");
-			exit(-1);
+		}
 	}
 
 	return retval;
@@ -1841,8 +1827,6 @@ COMMAND_HANDLER(handle_cortex_m3_vector_catch_command)
 	struct swjdp_common *swjdp = &armv7m->swjdp_info;
 	uint32_t demcr = 0;
 	int retval;
-	int i;
-
 	retval = cortex_m3_verify_pointer(cmd_ctx, cortex_m3);
 	if (retval != ERROR_OK)
 		return retval;
@@ -1863,6 +1847,7 @@ COMMAND_HANDLER(handle_cortex_m3_vector_catch_command)
 			}
 		}
 		while (argc-- > 0) {
+			unsigned i;
 			for (i = 0; i < ARRAY_SIZE(vec_ids); i++) {
 				if (strcmp(args[argc], vec_ids[i].name) != 0)
 					continue;
@@ -1883,7 +1868,7 @@ write:
 		mem_ap_read_atomic_u32(swjdp, DCB_DEMCR, &demcr);
 	}
 
-	for (i = 0; i < ARRAY_SIZE(vec_ids); i++)
+	for (unsigned i = 0; i < ARRAY_SIZE(vec_ids); i++)
 		command_print(cmd_ctx, "%9s: %s", vec_ids[i].name,
 			(demcr & vec_ids[i].mask) ? "catch" : "ignore");
 
@@ -1931,7 +1916,7 @@ COMMAND_HANDLER(handle_cortex_m3_mask_interrupts_command)
 static int cortex_m3_register_commands(struct command_context *cmd_ctx)
 {
 	int retval;
-	command_t *cortex_m3_cmd;
+	struct command *cortex_m3_cmd;
 
 	retval = armv7m_register_commands(cmd_ctx);