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

armv7m: use generic arm read/write_core_reg 

Change-Id: I0c15acc1278d2972269d294078495e6b069c830b
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/969
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Spencer Oliver 2013-01-09 11:04:17 +00:00 committed by Andreas Fritiofson
parent e6b27756da
commit 98709ab461
4 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/target/armv7m.c
View File

@ -135,6 +135,7 @@ int armv7m_restore_context(struct target *target)
{
int i;
struct armv7m_common *armv7m = target_to_armv7m(target);
struct reg_cache *cache = armv7m->arm.core_cache;
LOG_DEBUG(" ");
@ -142,8 +143,10 @@ int armv7m_restore_context(struct target *target)
armv7m->pre_restore_context(target);
for (i = ARMV7M_NUM_REGS - 1; i >= 0; i--) {
if (armv7m->arm.core_cache->reg_list[i].dirty)
armv7m->write_core_reg(target, i);
if (cache->reg_list[i].dirty) {
uint32_t value = buf_get_u32(cache->reg_list[i].value, 0, 32);
armv7m->arm.write_core_reg(target, &cache->reg_list[i], i, ARM_MODE_ANY, value);
}
}
return ERROR_OK;
@ -175,12 +178,12 @@ static int armv7m_get_core_reg(struct reg *reg)
int retval;
struct arm_reg *armv7m_reg = reg->arch_info;
struct target *target = armv7m_reg->target;
struct armv7m_common *armv7m = target_to_armv7m(target);
struct arm *arm = target_to_arm(target);
if (target->state != TARGET_HALTED)
return ERROR_TARGET_NOT_HALTED;
retval = armv7m->read_core_reg(target, armv7m_reg->num);
retval = arm->read_core_reg(target, reg, armv7m_reg->num, arm->core_mode);
return retval;
}
@ -201,20 +204,20 @@ static int armv7m_set_core_reg(struct reg *reg, uint8_t *buf)
return ERROR_OK;
}
static int armv7m_read_core_reg(struct target *target, unsigned num)
static int armv7m_read_core_reg(struct target *target, struct reg *r,
int num, enum arm_mode mode)
{
uint32_t reg_value;
int retval;
struct arm_reg *armv7m_core_reg;
struct armv7m_common *armv7m = target_to_armv7m(target);
if (num >= ARMV7M_NUM_REGS)
return ERROR_COMMAND_SYNTAX_ERROR;
assert(num < (int)armv7m->arm.core_cache->num_regs);
armv7m_core_reg = armv7m->arm.core_cache->reg_list[num].arch_info;
retval = armv7m->load_core_reg_u32(target,
armv7m_core_reg->num,
&reg_value);
armv7m_core_reg->num, &reg_value);
buf_set_u32(armv7m->arm.core_cache->reg_list[num].value, 0, 32, reg_value);
armv7m->arm.core_cache->reg_list[num].valid = 1;
armv7m->arm.core_cache->reg_list[num].dirty = 0;
@ -222,15 +225,15 @@ static int armv7m_read_core_reg(struct target *target, unsigned num)
return retval;
}
static int armv7m_write_core_reg(struct target *target, unsigned num)
static int armv7m_write_core_reg(struct target *target, struct reg *r,
int num, enum arm_mode mode, uint32_t value)
{
int retval;
uint32_t reg_value;
struct arm_reg *armv7m_core_reg;
struct armv7m_common *armv7m = target_to_armv7m(target);
if (num >= ARMV7M_NUM_REGS)
return ERROR_COMMAND_SYNTAX_ERROR;
assert(num < (int)armv7m->arm.core_cache->num_regs);
reg_value = buf_get_u32(armv7m->arm.core_cache->reg_list[num].value, 0, 32);
armv7m_core_reg = armv7m->arm.core_cache->reg_list[num].arch_info;
@ -242,6 +245,7 @@ static int armv7m_write_core_reg(struct target *target, unsigned num)
armv7m->arm.core_cache->reg_list[num].dirty = armv7m->arm.core_cache->reg_list[num].valid;
return ERROR_JTAG_DEVICE_ERROR;
}
LOG_DEBUG("write core reg %i value 0x%" PRIx32 "", num, reg_value);
armv7m->arm.core_cache->reg_list[num].valid = 1;
armv7m->arm.core_cache->reg_list[num].dirty = 0;
@ -344,8 +348,7 @@ int armv7m_start_algorithm(struct target *target,
/* refresh core register cache
* Not needed if core register cache is always consistent with target process state */
for (unsigned i = 0; i < ARMV7M_NUM_REGS; i++) {
if (!armv7m->arm.core_cache->reg_list[i].valid)
armv7m->read_core_reg(target, i);
armv7m_algorithm_info->context[i] = buf_get_u32(
armv7m->arm.core_cache->reg_list[i].value,
0,
@ -578,11 +581,8 @@ int armv7m_init_arch_info(struct target *target, struct armv7m_common *armv7m)
arm->arch_info = armv7m;
arm->setup_semihosting = armv7m_setup_semihosting;
/* FIXME remove v7m-specific r/w core_reg functions;
* use the generic ARM core support..
*/
armv7m->read_core_reg = armv7m_read_core_reg;
armv7m->write_core_reg = armv7m_write_core_reg;
arm->read_core_reg = armv7m_read_core_reg;
arm->write_core_reg = armv7m_write_core_reg;
return arm_init_arch_info(target, arm);
}

4
src/target/armv7m.h
View File

@ -164,10 +164,6 @@ struct armv7m_common {
int (*load_core_reg_u32)(struct target *target, uint32_t num, uint32_t *value);
int (*store_core_reg_u32)(struct target *target, uint32_t num, uint32_t value);
/* register cache to processor synchronization */
int (*read_core_reg)(struct target *target, unsigned num);
int (*write_core_reg)(struct target *target, unsigned num);
int (*examine_debug_reason)(struct target *target);
int (*post_debug_entry)(struct target *target);

5
src/target/cortex_m.c
View File

@ -425,8 +425,9 @@ static int cortex_m3_debug_entry(struct target *target)
int num_regs = arm->core_cache->num_regs;
for (i = 0; i < num_regs; i++) {
if (!armv7m->arm.core_cache->reg_list[i].valid)
armv7m->read_core_reg(target, i);
r = &armv7m->arm.core_cache->reg_list[i];
if (!r->valid)
arm->read_core_reg(target, r, i, ARM_MODE_ANY);
}
r = arm->core_cache->reg_list + ARMV7M_xPSR;

6
src/target/hla_target.c
View File

@ -314,8 +314,10 @@ static int adapter_load_context(struct target *target)
int num_regs = armv7m->arm.core_cache->num_regs;
for (int i = 0; i < num_regs; i++) {
if (!armv7m->arm.core_cache->reg_list[i].valid)
armv7m->read_core_reg(target, i);
struct reg *r = &armv7m->arm.core_cache->reg_list[i];
if (!r->valid)
armv7m->arm.read_core_reg(target, r, i, ARM_MODE_ANY);
}
return ERROR_OK;