imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/cortex_m: do not leak memory on reexamination 

This bug was exposed by Valgrind.

Change-Id: If50878664d928c0a44e309ca1452089c1ac71466
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2542
Tested-by: jenkins
Reviewed-by: Stian Skjelstad <stian@nixia.no>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
Paul Fertser 2015-02-11 11:02:34 +03:00
parent b71ae9b1a7
commit 11b6ab90fb
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/target/cortex_m.c
View File

@ -61,6 +61,7 @@
/* forward declarations */
static int cortex_m_store_core_reg_u32(struct target *target,
uint32_t num, uint32_t value);
static void cortex_m_dwt_free(struct target *target);
static int cortexm_dap_read_coreregister_u32(struct target *target,
uint32_t *value, int regnum)
@ -1833,6 +1834,27 @@ fail1:
*/
}
static void cortex_m_dwt_free(struct target *target)
{
struct cortex_m_common *cm = target_to_cm(target);
struct reg_cache *cache = cm->dwt_cache;
free(cm->dwt_comparator_list);
cm->dwt_comparator_list = NULL;
if (cache) {
register_unlink_cache(&target->reg_cache, cache);
if (cache->reg_list) {
for (size_t i = 0; i < cache->num_regs; i++)
free(cache->reg_list[i].arch_info);
free(cache->reg_list);
}
free(cache);
}
cm->dwt_cache = NULL;
}
#define MVFR0 0xe000ef40
#define MVFR1 0xe000ef44
@ -1910,6 +1932,7 @@ int cortex_m_examine(struct target *target)
cortex_m->fp_num_code = ((fpcr >> 8) & 0x70) | ((fpcr >> 4) & 0xF);
cortex_m->fp_num_lit = (fpcr >> 8) & 0xF;
cortex_m->fp_code_available = cortex_m->fp_num_code;
free(cortex_m->fp_comparator_list);
cortex_m->fp_comparator_list = calloc(
cortex_m->fp_num_code + cortex_m->fp_num_lit,
sizeof(struct cortex_m_fp_comparator));
@ -1928,6 +1951,7 @@ int cortex_m_examine(struct target *target)
cortex_m->fp_num_lit);
/* Setup DWT */
cortex_m_dwt_free(target);
cortex_m_dwt_setup(cortex_m, target);
/* These hardware breakpoints only work for code in flash! */

8
src/target/register.c
View File

@ -72,6 +72,14 @@ struct reg_cache **register_get_last_cache_p(struct reg_cache **first)
return cache_p;
}
void register_unlink_cache(struct reg_cache **cache_p, const struct reg_cache *cache)
{
while (*cache_p && *cache_p != cache)
cache_p = &((*cache_p)->next);
if (*cache_p)
*cache_p = cache->next;
}
/** Marks the contents of the register cache as invalid (and clean). */
void register_cache_invalidate(struct reg_cache *cache)
{

1
src/target/register.h
View File

@ -146,6 +146,7 @@ struct reg_arch_type {
struct reg *register_get_by_name(struct reg_cache *first,
const char *name, bool search_all);
struct reg_cache **register_get_last_cache_p(struct reg_cache **first);
void register_unlink_cache(struct reg_cache **cache_p, const struct reg_cache *cache);
void register_cache_invalidate(struct reg_cache *cache);
void register_init_dummy(struct reg *reg);