[openocd-svn] Main OpenOCD repository branch, master, updated. 0.2.0-375-gab3e913

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  ab3e9131136963201cedbd40afef010bea6b31c0 (commit)
      from  1a9c531938e55c6b05c1d02a895a2300c7ac1a55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ab3e9131136963201cedbd40afef010bea6b31c0
Author: David Brownell <dbr...@us...>
Date:   Wed Oct 14 20:04:33 2009 -0700

    portability updates
    
    Based on some patches from <red...@gm...>
    for preliminary Win64 compilation.  More such updates are
    needed, but they need work.  Compile tested on 64 and 32 bit
    Linuxes, and Cygwin.
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/helper/jim.c b/src/helper/jim.c
index 48e21e9..dfee1dd 100644
--- a/src/helper/jim.c
+++ b/src/helper/jim.c
@@ -4754,7 +4754,7 @@ const char *Jim_GetSharedString(Jim_Interp *interp, const char *str)
         Jim_AddHashEntry(&interp->sharedStrings, strCopy, (void*)1);
         return strCopy;
     } else {
-        long refCount = (long) he->val;
+        intptr_t refCount = (intptr_t) he->val;
 
         refCount++;
         he->val = (void*) refCount;
@@ -4764,13 +4764,13 @@ const char *Jim_GetSharedString(Jim_Interp *interp, const char *str)
 
 void Jim_ReleaseSharedString(Jim_Interp *interp, const char *str)
 {
-    long refCount;
+    intptr_t refCount;
     Jim_HashEntry *he = Jim_FindHashEntry(&interp->sharedStrings, str);
 
     if (he == NULL)
         Jim_Panic(interp,"Jim_ReleaseSharedString called with "
               "unknown shared string '%s'", str);
-    refCount = (long) he->val;
+    refCount = (intptr_t) he->val;
     refCount--;
     if (refCount == 0) {
         Jim_DeleteHashEntry(&interp->sharedStrings, str);
diff --git a/src/jtag/core.c b/src/jtag/core.c
index 564b93f..415d1e8 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -991,8 +991,9 @@ static bool jtag_examine_chain_match_tap(const struct jtag_tap_s *tap)
 		return true;
 
 	/* Loop over the expected identification codes and test for a match */
-	uint8_t ii;
-	for (ii = 0; ii < tap->expected_ids_cnt; ii++)
+	unsigned ii, limit = tap->expected_ids_cnt;
+
+	for (ii = 0; ii < limit; ii++)
 	{
 		if (tap->idcode == tap->expected_ids[ii])
 			return true;
@@ -1005,11 +1006,11 @@ static bool jtag_examine_chain_match_tap(const struct jtag_tap_s *tap)
 	/* If none of the expected ids matched, warn */
 	jtag_examine_chain_display(LOG_LVL_WARNING, "UNEXPECTED",
 			tap->dotted_name, tap->idcode);
-	for (ii = 0; ii < tap->expected_ids_cnt; ii++)
+	for (ii = 0; ii < limit; ii++)
 	{
 		char msg[32];
-		snprintf(msg, sizeof(msg), "expected %hhu of %hhu",
-				ii + 1, tap->expected_ids_cnt);
+
+		snprintf(msg, sizeof(msg), "expected %u of %u", ii + 1, limit);
 		jtag_examine_chain_display(LOG_LVL_ERROR, msg,
 				tap->dotted_name, tap->expected_ids[ii]);
 	}
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 94d5fb1..289d64c 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -1656,10 +1656,10 @@ int arm11_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t
 //		return ERROR_FAIL;
 
 	// Save regs
-	for (size_t i = 0; i < 16; i++)
+	for (unsigned i = 0; i < 16; i++)
 	{
 		context[i] = buf_get_u32((uint8_t*)(&arm11->reg_values[i]),0,32);
-		LOG_DEBUG("Save %zi: 0x%" PRIx32 "",i,context[i]);
+		LOG_DEBUG("Save %u: 0x%" PRIx32 "", i, context[i]);
 	}
 
 	cpsr = buf_get_u32((uint8_t*)(arm11->reg_values + ARM11_RC_CPSR),0,32);
diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h
index 3c8411f..7ea3826 100644
--- a/src/target/armv4_5.h
+++ b/src/target/armv4_5.h
@@ -74,7 +74,7 @@ typedef struct armv4_5_common_s
 {
 	int common_magic;
 	reg_cache_t *core_cache;
-	enum armv4_5_mode core_mode;
+	int /* armv4_5_mode */ core_mode;
 	enum armv4_5_state core_state;
 	bool is_armv4;
 	int (*full_context)(struct target_s *target);

-----------------------------------------------------------------------

Summary of changes:
 src/helper/jim.c     |    6 +++---
 src/jtag/core.c      |   11 ++++++-----
 src/target/arm11.c   |    4 ++--
 src/target/armv4_5.h |    2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository