Vita3K/unicorn
1
0
Fork 0
mirror of https://github.com/Vita3K/unicorn.git synced 2024-11-27 07:10:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add implementation of access to the ARM SPSR register. (#1178)

Browse Source 
The SPSR register is named within the Unicorn headers, but the code
to access it is absent. This means that it will always read as 0 and
ignore writes. This makes it harder to work with changes in processor
mode, as the usual way to return from a CPU exception is a
`MOVS pc, lr` for undefined instructions or `SUBS pc, lr, #4`
for most other aborts - which implicitly restores the CPSR from SPSR.

This change adds the access to the SPSR so that it can be read and
written as the caller might expect.
This commit is contained in:
Charles Ferguson 2020-01-02 01:42:01 +00:00 committed by Nguyen Anh Quynh
parent 810bd34eef
commit 99097cab4c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qemu/target-arm/unicorn_arm.c
View File

@ -74,6 +74,9 @@ int arm_reg_read(struct uc_struct *uc, unsigned int *regs, void **vals, int coun
case UC_ARM_REG_CPSR: case UC_ARM_REG_CPSR:
*(int32_t *)value = cpsr_read(&ARM_CPU(uc, mycpu)->env); *(int32_t *)value = cpsr_read(&ARM_CPU(uc, mycpu)->env);
break; break;
case UC_ARM_REG_SPSR:
*(int32_t *)value = ARM_CPU(uc, mycpu)->env.spsr;
break;
//case UC_ARM_REG_SP: //case UC_ARM_REG_SP:
case UC_ARM_REG_R13: case UC_ARM_REG_R13:
*(int32_t *)value = ARM_CPU(uc, mycpu)->env.regs[13]; *(int32_t *)value = ARM_CPU(uc, mycpu)->env.regs[13];
@ -134,6 +137,9 @@ int arm_reg_write(struct uc_struct *uc, unsigned int *regs, void* const* vals, i
case UC_ARM_REG_CPSR: case UC_ARM_REG_CPSR:
cpsr_write(&ARM_CPU(uc, mycpu)->env, *(uint32_t *)value, ~0); cpsr_write(&ARM_CPU(uc, mycpu)->env, *(uint32_t *)value, ~0);
break; break;
case UC_ARM_REG_SPSR:
ARM_CPU(uc, mycpu)->env.spsr = *(uint32_t *)value;
break;
//case UC_ARM_REG_SP: //case UC_ARM_REG_SP:
case UC_ARM_REG_R13: case UC_ARM_REG_R13:
ARM_CPU(uc, mycpu)->env.regs[13] = *(uint32_t *)value; ARM_CPU(uc, mycpu)->env.regs[13] = *(uint32_t *)value;