From: David Brownell <dbrownell@users.sourceforge.net>
Date: Sun, 22 Nov 2009 18:21:22 +0000 (-0800)
Subject: ARM11: remove needless string format #ifdeffery
X-Git-Tag: v0.4.0-rc1~449
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fa618cc74deea6741c745b4f80dace2421209a1e;p=openocd

ARM11: remove needless string format #ifdeffery

We don't need to use size_t in these places; so it's easy
to be rid of the need for this #ifdef and its MS-derived
portability problems.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---

diff --git a/src/target/arm11.c b/src/target/arm11.c
index 9c427050..1a7b4e0d 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -448,15 +448,16 @@ static int arm11_leave_debug_state(struct arm11_common *arm11)
 
 	/* restore R1 - R14 */
 
-	for (size_t i = 1; i < 15; i++)
+	for (unsigned i = 1; i < 15; i++)
 	{
 		if (!arm11->reg_list[ARM11_RC_RX + i].dirty)
 			continue;
 
 		/* MRC p14,0,r?,c0,c5,0 */
-		arm11_run_instr_data_to_core1(arm11, 0xee100e15 | (i << 12), R(RX + i));
+		arm11_run_instr_data_to_core1(arm11,
+				0xee100e15 | (i << 12), R(RX + i));
 
-		//	LOG_DEBUG("RESTORE R" ZU " %08x", i, R(RX + i));
+		//	LOG_DEBUG("RESTORE R%u %08x", i, R(RX + i));
 	}
 
 	retval = arm11_run_instr_data_finish(arm11);
@@ -742,7 +743,7 @@ static int arm11_resume(struct target *target, int current,
 
 		/* set all breakpoints */
 
-		size_t		brp_num = 0;
+		unsigned brp_num = 0;
 
 		for (bp = target->breakpoints; bp; bp = bp->next)
 		{
@@ -757,7 +758,8 @@ static int arm11_resume(struct target *target, int current,
 
 			arm11_sc7_run(arm11, brp, ARRAY_SIZE(brp));
 
-			LOG_DEBUG("Add BP " ZU " at %08" PRIx32 "", brp_num, bp->address);
+			LOG_DEBUG("Add BP %d at %08" PRIx32, brp_num,
+					bp->address);
 
 			brp_num++;
 		}
@@ -1869,7 +1871,14 @@ static int arm11_build_reg_cache(struct target *target)
 		ARM11_REGCACHE_COUNT != ARRAY_SIZE(arm11_reg_defs) ||
 		ARM11_REGCACHE_COUNT != ARM11_RC_MAX)
 	{
-		LOG_ERROR("BUG: arm11->reg_values inconsistent (%d " ZU " " ZU " %d)", ARM11_REGCACHE_COUNT, ARRAY_SIZE(arm11->reg_values), ARRAY_SIZE(arm11_reg_defs), ARM11_RC_MAX);
+		LOG_ERROR("BUG: arm11->reg_values inconsistent (%d %u %u %d)",
+				ARM11_REGCACHE_COUNT,
+				(unsigned) ARRAY_SIZE(arm11->reg_values),
+				(unsigned) ARRAY_SIZE(arm11_reg_defs),
+				ARM11_RC_MAX);
+		/* FIXME minimally, use a build_bug_on(X) mechanism;
+		 * runtime exit() here is bad!
+		 */
 		exit(-1);
 	}
 
diff --git a/src/target/arm11.h b/src/target/arm11.h
index 79f4b6b9..0b379294 100644
--- a/src/target/arm11.h
+++ b/src/target/arm11.h
@@ -28,16 +28,6 @@
 #define NEW(type, variable, items)			\
 	type * variable = calloc(1, sizeof(type) * items)
 
-/* For MinGW use 'I' prefix to print size_t (instead of 'z') */
-/* Except if __USE_MINGW_ANSI_STDIO is defined with MinGW    */
-
-#if (!defined(__MSVCRT__) || defined(__USE_MINGW_ANSI_STDIO))
-#define ZU		"%zu"
-#else
-#define ZU		"%Iu"
-#endif
-
-
 /* TEMPORARY -- till we switch to the shared infrastructure */
 #define ARM11_REGCACHE_COUNT		20
 
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index bdbcc8f3..0f7e4953 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -588,12 +588,13 @@ int arm11_run_instr_data_to_core_noack(struct arm11_common * arm11, uint32_t opc
 	arm11_setup_field(arm11,  1,    NULL,			NULL,				chain5_fields + 2);
 
 	uint8_t			*Readies;
-	size_t readiesNum = (count + 1);
-	size_t bytes = sizeof(*Readies)*readiesNum;
+	unsigned readiesNum = count + 1;
+	unsigned bytes = sizeof(*Readies)*readiesNum;
+
 	Readies = (uint8_t *) malloc(bytes);
 	if (Readies == NULL)
 	{
-		LOG_ERROR("Out of memory allocating " ZU " bytes", bytes);
+		LOG_ERROR("Out of memory allocating %u bytes", bytes);
 		return ERROR_FAIL;
 	}
 
@@ -626,7 +627,7 @@ int arm11_run_instr_data_to_core_noack(struct arm11_common * arm11, uint32_t opc
 	int retval = jtag_execute_queue();
 	if (retval == ERROR_OK)
 	{
-		size_t error_count = 0;
+		unsigned error_count = 0;
 
 		for (size_t i = 0; i < readiesNum; i++)
 		{
@@ -637,7 +638,8 @@ int arm11_run_instr_data_to_core_noack(struct arm11_common * arm11, uint32_t opc
 		}
 
 		if (error_count > 0 )
-			LOG_ERROR(ZU " words out of " ZU " not transferred", error_count, readiesNum);
+			LOG_ERROR("%u words out of %u not transferred",
+				error_count, readiesNum);
 
 	}