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

armv7m: do not access FPU registers when not present 

This is runtime and valgrind tested with l0, l1 and f3 hla boards.

Change-Id: I49b0b042253d5f3bf216997f0203583db319fe23
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2516
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
Paul Fertser 2015-01-29 13:58:45 +03:00
parent dccbf7d88d
commit 217403ce09
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/target/armv7m.c
View File

@ -148,7 +148,7 @@ int armv7m_restore_context(struct target *target)
if (armv7m->pre_restore_context) if (armv7m->pre_restore_context)
armv7m->pre_restore_context(target); armv7m->pre_restore_context(target);
for (i = ARMV7M_NUM_REGS - 1; i >= 0; i--) { for (i = cache->num_regs - 1; i >= 0; i--) {
if (cache->reg_list[i].dirty) { if (cache->reg_list[i].dirty) {
armv7m->arm.write_core_reg(target, &cache->reg_list[i], i, armv7m->arm.write_core_reg(target, &cache->reg_list[i], i,
ARM_MODE_ANY, cache->reg_list[i].value); ARM_MODE_ANY, cache->reg_list[i].value);
@ -302,7 +302,7 @@ int armv7m_get_gdb_reg_list(struct target *target, struct reg **reg_list[],
int i; int i;
if (reg_class == REG_CLASS_ALL) if (reg_class == REG_CLASS_ALL)
*reg_list_size = ARMV7M_NUM_REGS; *reg_list_size = armv7m->arm.core_cache->num_regs;
else else
*reg_list_size = ARMV7M_NUM_CORE_REGS; *reg_list_size = ARMV7M_NUM_CORE_REGS;
@ -368,7 +368,7 @@ int armv7m_start_algorithm(struct target *target,
/* refresh core register cache /* refresh core register cache
* Not needed if core register cache is always consistent with target process state */ * Not needed if core register cache is always consistent with target process state */
for (unsigned i = 0; i < ARMV7M_NUM_REGS; i++) { for (unsigned i = 0; i < armv7m->arm.core_cache->num_regs; i++) {
armv7m_algorithm_info->context[i] = buf_get_u32( armv7m_algorithm_info->context[i] = buf_get_u32(
armv7m->arm.core_cache->reg_list[i].value, armv7m->arm.core_cache->reg_list[i].value,
@ -503,7 +503,7 @@ int armv7m_wait_algorithm(struct target *target,
} }
} }
for (int i = ARMV7M_NUM_REGS - 1; i >= 0; i--) { for (int i = armv7m->arm.core_cache->num_regs - 1; i >= 0; i--) {
uint32_t regvalue; uint32_t regvalue;
regvalue = buf_get_u32(armv7m->arm.core_cache->reg_list[i].value, 0, 32); regvalue = buf_get_u32(armv7m->arm.core_cache->reg_list[i].value, 0, 32);
if (regvalue != armv7m_algorithm_info->context[i]) { if (regvalue != armv7m_algorithm_info->context[i]) {

1
src/target/armv7m.h
View File

@ -136,6 +136,7 @@ enum {
}; };
#define ARMV7M_NUM_CORE_REGS (ARMV7M_xPSR + 1) #define ARMV7M_NUM_CORE_REGS (ARMV7M_xPSR + 1)
#define ARMV7M_NUM_CORE_REGS_NOFP (ARMV7M_NUM_CORE_REGS + 6)
#define ARMV7M_COMMON_MAGIC 0x2A452A45 #define ARMV7M_COMMON_MAGIC 0x2A452A45

11
src/target/cortex_m.c
View File

@ -1885,6 +1885,17 @@ int cortex_m_examine(struct target *target)
armv7m->arm.is_armv6m = true; armv7m->arm.is_armv6m = true;
} }
if (armv7m->fp_feature != FPv4_SP &&
armv7m->arm.core_cache->num_regs > ARMV7M_NUM_CORE_REGS_NOFP) {
/* free unavailable FPU registers */
size_t idx;
for (idx = ARMV7M_NUM_CORE_REGS_NOFP;
idx < armv7m->arm.core_cache->num_regs;
idx++)
free(armv7m->arm.core_cache->reg_list[idx].value);
armv7m->arm.core_cache->num_regs = ARMV7M_NUM_CORE_REGS_NOFP;
}
if (i == 4 || i == 3) { if (i == 4 || i == 3) {
/* Cortex-M3/M4 has 4096 bytes autoincrement range */ /* Cortex-M3/M4 has 4096 bytes autoincrement range */
armv7m->dap.tar_autoincr_block = (1 << 12); armv7m->dap.tar_autoincr_block = (1 << 12);