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

- stops multiple calls to examine from allocating the breakpoint arrays 

git-svn-id: svn://svn.berlios.de/openocd/trunk@1171 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
ntfreak 2008-11-14 10:48:17 +00:00
parent c0787b6994
commit 76b3c6ece6
1 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/target/cortex_m3.c
View File

@ -1357,13 +1357,15 @@ int cortex_m3_examine(struct target_s *target)
cortex_m3_common_t *cortex_m3 = armv7m->arch_info; cortex_m3_common_t *cortex_m3 = armv7m->arch_info;
swjdp_common_t *swjdp = &cortex_m3->swjdp_info; swjdp_common_t *swjdp = &cortex_m3->swjdp_info;
target->type->examined = 1; if ((retval = ahbap_debugport_init(swjdp)) != ERROR_OK)
if ((retval=ahbap_debugport_init(swjdp))!=ERROR_OK)
return retval; return retval;
if (!target->type->examined)
{
target->type->examined = 1;
/* Read from Device Identification Registers */ /* Read from Device Identification Registers */
if ((retval=target_read_u32(target, CPUID, &cpuid))!=ERROR_OK) if ((retval = target_read_u32(target, CPUID, &cpuid)) != ERROR_OK)
return retval; return retval;
if (((cpuid >> 4) & 0xc3f) == 0xc23) if (((cpuid >> 4) & 0xc3f) == 0xc23)
@ -1397,11 +1399,12 @@ int cortex_m3_examine(struct target_s *target)
target_read_u32(target, DWT_CTRL, &dwtcr); target_read_u32(target, DWT_CTRL, &dwtcr);
cortex_m3->dwt_num_comp = (dwtcr >> 28) & 0xF; cortex_m3->dwt_num_comp = (dwtcr >> 28) & 0xF;
cortex_m3->dwt_comp_available = cortex_m3->dwt_num_comp; cortex_m3->dwt_comp_available = cortex_m3->dwt_num_comp;
cortex_m3->dwt_comparator_list=calloc(cortex_m3->dwt_num_comp, sizeof(cortex_m3_dwt_comparator_t)); cortex_m3->dwt_comparator_list = calloc(cortex_m3->dwt_num_comp, sizeof(cortex_m3_dwt_comparator_t));
for (i = 0; i < cortex_m3->dwt_num_comp; i++) for (i = 0; i < cortex_m3->dwt_num_comp; i++)
{ {
cortex_m3->dwt_comparator_list[i].dwt_comparator_address = DWT_COMP0 + 0x10 * i; cortex_m3->dwt_comparator_list[i].dwt_comparator_address = DWT_COMP0 + 0x10 * i;
} }
}
return ERROR_OK; return ERROR_OK;
} }