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

Check return values to avoid infinite wait in loop on error. 

git-svn-id: svn://svn.berlios.de/openocd/trunk@2709 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
mlu 2009-09-14 22:41:47 +00:00
parent d4e4d65d28
commit 45674af63a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/target/cortex_a8.c
View File

@ -153,7 +153,7 @@ mdw 0x54011080 4
int cortex_a8_exec_opcode(target_t *target, uint32_t opcode) int cortex_a8_exec_opcode(target_t *target, uint32_t opcode)
{ {
uint32_t dscr; uint32_t dscr;
int retvalue; int retval;
/* get pointers to arch-specific information */ /* get pointers to arch-specific information */
armv4_5_common_t *armv4_5 = target->arch_info; armv4_5_common_t *armv4_5 = target->arch_info;
armv7a_common_t *armv7a = armv4_5->arch_info; armv7a_common_t *armv7a = armv4_5->arch_info;
@ -162,8 +162,10 @@ int cortex_a8_exec_opcode(target_t *target, uint32_t opcode)
LOG_DEBUG("exec opcode 0x%08" PRIx32, opcode); LOG_DEBUG("exec opcode 0x%08" PRIx32, opcode);
do do
{ {
retvalue = mem_ap_read_atomic_u32(swjdp, retval = mem_ap_read_atomic_u32(swjdp,
OMAP3530_DEBUG_BASE + CPUDBG_DSCR, &dscr); OMAP3530_DEBUG_BASE + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK)
return retval;
} }
while ((dscr & (1 << DSCR_INSTR_COMP)) == 0); /* Wait for InstrCompl bit to be set */ while ((dscr & (1 << DSCR_INSTR_COMP)) == 0); /* Wait for InstrCompl bit to be set */
@ -171,12 +173,14 @@ int cortex_a8_exec_opcode(target_t *target, uint32_t opcode)
do do
{ {
retvalue = mem_ap_read_atomic_u32(swjdp, retval = mem_ap_read_atomic_u32(swjdp,
OMAP3530_DEBUG_BASE + CPUDBG_DSCR, &dscr); OMAP3530_DEBUG_BASE + CPUDBG_DSCR, &dscr);
if (retval != ERROR_OK)
return retval;
} }
while ((dscr & (1 << DSCR_INSTR_COMP)) == 0); /* Wait for InstrCompl bit to be set */ while ((dscr & (1 << DSCR_INSTR_COMP)) == 0); /* Wait for InstrCompl bit to be set */
return retvalue; return retval;
} }
/************************************************************************** /**************************************************************************