interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

target/armv7m: use arch_info[i].value instead of allocated memory 

Change-Id: I9422cab484d0769404516947e16da1baa001a4e0
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/5328
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Tomas Vanek 2019-10-20 14:27:36 +02:00 committed by Antonio Borneo
parent d811d2838b
commit fc91936be7
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/target/armv7m.c
View File

@ -741,10 +741,7 @@ struct reg_cache *armv7m_build_reg_cache(struct target *target)
reg_list[i].name = armv7m_regs[i].name; reg_list[i].name = armv7m_regs[i].name;
reg_list[i].size = armv7m_regs[i].bits; reg_list[i].size = armv7m_regs[i].bits;
size_t storage_size = DIV_ROUND_UP(armv7m_regs[i].bits, 8); reg_list[i].value = arch_info[i].value;
if (storage_size < 4)
storage_size = 4;
reg_list[i].value = calloc(1, storage_size);
reg_list[i].dirty = false; reg_list[i].dirty = false;
reg_list[i].valid = false; reg_list[i].valid = false;
reg_list[i].hidden = i == ARMV7M_PMSK_BPRI_FLTMSK_CTRL; reg_list[i].hidden = i == ARMV7M_PMSK_BPRI_FLTMSK_CTRL;
@ -798,7 +795,6 @@ void armv7m_free_reg_cache(struct target *target)
free(reg->feature); free(reg->feature);
free(reg->reg_data_type); free(reg->reg_data_type);
free(reg->value);
} }
free(cache->reg_list[0].arch_info); free(cache->reg_list[0].arch_info);

1
src/target/cortex_m.c
View File

@ -2044,7 +2044,6 @@ int cortex_m_examine(struct target *target)
for (idx = ARMV7M_NUM_CORE_REGS_NOFP; for (idx = ARMV7M_NUM_CORE_REGS_NOFP;
idx < armv7m->arm.core_cache->num_regs; idx < armv7m->arm.core_cache->num_regs;
idx++) { idx++) {
free(armv7m->arm.core_cache->reg_list[idx].value);
free(armv7m->arm.core_cache->reg_list[idx].feature); free(armv7m->arm.core_cache->reg_list[idx].feature);
free(armv7m->arm.core_cache->reg_list[idx].reg_data_type); free(armv7m->arm.core_cache->reg_list[idx].reg_data_type);
} }