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

Michael Bruck: fix warnings. 

git-svn-id: svn://svn.berlios.de/openocd/trunk@440 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2008-03-04 07:13:08 +00:00
parent 58cccae639
commit ea306d3e59
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/target/arm11.c
View File

@ -282,7 +282,6 @@ enum arm11_regcache_ids
ARM11_RC_WDTR, ARM11_RC_WDTR,
ARM11_RC_RDTR, ARM11_RC_RDTR,
ARM11_RC_MAX, ARM11_RC_MAX,
}; };
@ -562,7 +561,7 @@ void arm11_leave_debug_state(arm11_common_t * arm11)
/* MRC p14,0,r?,c0,c5,0 */ /* 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));
// DEBUG("RESTORE R%d %08x", i, R(RX + i)); // DEBUG("RESTORE R" ZU " %08x", i, R(RX + i));
}} }}
arm11_run_instr_data_finish(arm11); arm11_run_instr_data_finish(arm11);
@ -788,7 +787,7 @@ int arm11_resume(struct target_s *target, int current, u32 address, int handle_b
if (!current) if (!current)
R(PC) = address; R(PC) = address;
INFO("RESUME PC %08x", R(PC)); INFO("RESUME PC %08x%s", R(PC), !current ? "!" : "");
/* clear breakpoints/watchpoints and VCR*/ /* clear breakpoints/watchpoints and VCR*/
arm11_sc7_clear_vbw(arm11); arm11_sc7_clear_vbw(arm11);
@ -827,7 +826,7 @@ int arm11_resume(struct target_s *target, int current, u32 address, int handle_b
arm11_sc7_run(arm11, brp, asizeof(brp)); arm11_sc7_run(arm11, brp, asizeof(brp));
DEBUG("Add BP %zd at %08x", brp_num, bp->address); DEBUG("Add BP " ZU " at %08x", brp_num, bp->address);
brp_num++; brp_num++;
} }
@ -885,7 +884,7 @@ int arm11_step(struct target_s *target, int current, u32 address, int handle_bre
if (!current) if (!current)
R(PC) = address; R(PC) = address;
INFO("STEP PC %08x", R(PC)); INFO("STEP PC %08x%s", R(PC), !current ? "!" : "");
/** \todo TODO: Thumb not supported here */ /** \todo TODO: Thumb not supported here */
@ -1518,7 +1517,7 @@ void arm11_build_reg_cache(target_t *target)
ARM11_REGCACHE_COUNT != asizeof(arm11_reg_defs) || ARM11_REGCACHE_COUNT != asizeof(arm11_reg_defs) ||
ARM11_REGCACHE_COUNT != ARM11_RC_MAX) ARM11_REGCACHE_COUNT != ARM11_RC_MAX)
{ {
ERROR("arm11->reg_values inconsistent (%d %zd %zd %d)", ARM11_REGCACHE_COUNT, asizeof(arm11->reg_values), asizeof(arm11_reg_defs), ARM11_RC_MAX); ERROR("arm11->reg_values inconsistent (%d " ZU " " ZU " %d)", ARM11_REGCACHE_COUNT, asizeof(arm11->reg_values), asizeof(arm11_reg_defs), ARM11_RC_MAX);
exit(-1); exit(-1);
} }

12
src/target/arm11.h
View File

@ -33,6 +33,18 @@
type * variable = calloc(1, sizeof(type) * items) type * variable = calloc(1, sizeof(type) * items)
/* Don't know exactly when %zu was added to glibc (CVS says in 1998).
Assume for now that its between GCC versions 3.x.x and 4.x.x .
MinGW's GCC 3.4.5 comes with a glibc that doesn't support it.
*/
#if __GNUC__ > 3
#define ZU "%zu"
#else
#define ZU "%u"
#endif
#define ARM11_REGCACHE_MODEREGS 0 #define ARM11_REGCACHE_MODEREGS 0
#define ARM11_REGCACHE_FREGS 0 #define ARM11_REGCACHE_FREGS 0

4
src/target/arm11_dbgtap.c
View File

@ -521,7 +521,7 @@ void arm11_run_instr_data_to_core_noack(arm11_common_t * arm11, u32 opcode, u32
}} }}
if (error_count) if (error_count)
ERROR("Transfer errors %d", error_count); ERROR("Transfer errors " ZU, error_count);
} }
@ -739,6 +739,8 @@ void arm11_sc7_clear_vbw(arm11_common_t * arm11)
} }
(pos++)->address = ARM11_SC7_VCR; (pos++)->address = ARM11_SC7_VCR;
arm11_sc7_run(arm11, clear_bw, asizeof(clear_bw));
} }
/** Write VCR register /** Write VCR register