interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

portability updates 

Based on some patches from <redirect.slash.nil@gmail.com>
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 <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell 2009-10-14 20:04:33 -07:00
parent bc792857a5
commit 510db585fd
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/helper/jim.c
View File

@ -4754,7 +4754,7 @@ const char *Jim_GetSharedString(Jim_Interp *interp, const char *str)
Jim_AddHashEntry(&interp->sharedStrings, strCopy, (void*)1); Jim_AddHashEntry(&interp->sharedStrings, strCopy, (void*)1);
return strCopy; return strCopy;
} else { } else {
long refCount = (long) he->val; intptr_t refCount = (intptr_t) he->val;
refCount++; refCount++;
he->val = (void*) 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) void Jim_ReleaseSharedString(Jim_Interp *interp, const char *str)
{ {
long refCount; intptr_t refCount;
Jim_HashEntry *he = Jim_FindHashEntry(&interp->sharedStrings, str); Jim_HashEntry *he = Jim_FindHashEntry(&interp->sharedStrings, str);
if (he == NULL) if (he == NULL)
Jim_Panic(interp,"Jim_ReleaseSharedString called with " Jim_Panic(interp,"Jim_ReleaseSharedString called with "
"unknown shared string '%s'", str); "unknown shared string '%s'", str);
refCount = (long) he->val; refCount = (intptr_t) he->val;
refCount--; refCount--;
if (refCount == 0) { if (refCount == 0) {
Jim_DeleteHashEntry(&interp->sharedStrings, str); Jim_DeleteHashEntry(&interp->sharedStrings, str);

11
src/jtag/core.c
View File

@ -991,8 +991,9 @@ static bool jtag_examine_chain_match_tap(const struct jtag_tap_s *tap)
return true; return true;
/* Loop over the expected identification codes and test for a match */ /* Loop over the expected identification codes and test for a match */
uint8_t ii; unsigned ii, limit = tap->expected_ids_cnt;
for (ii = 0; ii < tap->expected_ids_cnt; ii++)
for (ii = 0; ii < limit; ii++)
{ {
if (tap->idcode == tap->expected_ids[ii]) if (tap->idcode == tap->expected_ids[ii])
return true; 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 */ /* If none of the expected ids matched, warn */
jtag_examine_chain_display(LOG_LVL_WARNING, "UNEXPECTED", jtag_examine_chain_display(LOG_LVL_WARNING, "UNEXPECTED",
tap->dotted_name, tap->idcode); tap->dotted_name, tap->idcode);
for (ii = 0; ii < tap->expected_ids_cnt; ii++) for (ii = 0; ii < limit; ii++)
{ {
char msg[32]; 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, jtag_examine_chain_display(LOG_LVL_ERROR, msg,
tap->dotted_name, tap->expected_ids[ii]); tap->dotted_name, tap->expected_ids[ii]);
} }

4
src/target/arm11.c
View File

@ -1656,10 +1656,10 @@ int arm11_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t
// return ERROR_FAIL; // return ERROR_FAIL;
// Save regs // 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); 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); cpsr = buf_get_u32((uint8_t*)(arm11->reg_values + ARM11_RC_CPSR),0,32);

2
src/target/armv4_5.h
View File

@ -74,7 +74,7 @@ typedef struct armv4_5_common_s
{ {
int common_magic; int common_magic;
reg_cache_t *core_cache; reg_cache_t *core_cache;
enum armv4_5_mode core_mode; int /* armv4_5_mode */ core_mode;
enum armv4_5_state core_state; enum armv4_5_state core_state;
bool is_armv4; bool is_armv4;
int (*full_context)(struct target_s *target); int (*full_context)(struct target_s *target);