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

armv8: load aarch32 register through aarch64 equivalent 

The aarch32 register cache is only a separate view of the aarch64
registers. Load aarch32 registers through their aarch64 equivalents.

Change-Id: I3e932dfb782f03d73d30d942b24db340a5749e47
Signed-off-by: Matthias Welwarsky <matthias.welwarsky@sysgo.com>
Reviewed-on: http://openocd.zylin.com/3988
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
This commit is contained in:
Matthias Welwarsky 2016-11-27 11:39:47 +01:00 committed by Paul Fertser
parent 8b923532c1
commit 095ff3d210
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/target/armv8.c
View File

@ -1093,7 +1093,7 @@ static int armv8_get_core_reg32(struct reg *reg)
return ERROR_OK; return ERROR_OK;
} }
retval = arm->read_core_reg(target, reg, armv8_reg->num, arm->core_mode); retval = arm->read_core_reg(target, reg64, armv8_reg->num, arm->core_mode);
if (retval == ERROR_OK) if (retval == ERROR_OK)
reg->valid = reg64->valid; reg->valid = reg64->valid;
@ -1109,9 +1109,6 @@ static int armv8_set_core_reg32(struct reg *reg, uint8_t *buf)
struct reg *reg64 = cache->reg_list + armv8_reg->num; struct reg *reg64 = cache->reg_list + armv8_reg->num;
uint32_t value = buf_get_u32(buf, 0, 32); uint32_t value = buf_get_u32(buf, 0, 32);
if (target->state != TARGET_HALTED)
return ERROR_TARGET_NOT_HALTED;
if (reg64 == arm->cpsr) { if (reg64 == arm->cpsr) {
armv8_set_cpsr(arm, value); armv8_set_cpsr(arm, value);
} else { } else {
@ -1250,7 +1247,7 @@ int armv8_get_gdb_reg_list(struct target *target,
if (arm->core_state == ARM_STATE_AARCH64) { if (arm->core_state == ARM_STATE_AARCH64) {
LOG_DEBUG("Creating Aarch64 register list"); LOG_DEBUG("Creating Aarch64 register list for target %s", target_name(target));
switch (reg_class) { switch (reg_class) {
case REG_CLASS_GENERAL: case REG_CLASS_GENERAL:
@ -1277,7 +1274,7 @@ int armv8_get_gdb_reg_list(struct target *target,
} else { } else {
struct reg_cache *cache32 = arm->core_cache->next; struct reg_cache *cache32 = arm->core_cache->next;
LOG_DEBUG("Creating Aarch32 register list"); LOG_DEBUG("Creating Aarch32 register list for target %s", target_name(target));
switch (reg_class) { switch (reg_class) {
case REG_CLASS_GENERAL: case REG_CLASS_GENERAL: