yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-11 00:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uc_mode_fix' of https://github.com/xorstream/unicorn into xorstream-uc_mode_fix

Browse source
This commit is contained in:
Nguyen Anh Quynh 2016-01-23 09:59:17 +08:00
parent 067ace32f5 b4b83ff207
commit b52665fae2
1 changed files with 35 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
qemu/target-arm/unicorn_arm.c
View file

@ -42,27 +42,25 @@ int arm_reg_read(struct uc_struct *uc, unsigned int regid, void *value)
mycpu = first_cpu; mycpu = first_cpu;
if (!(uc->mode & ~UC_MODE_ARM_MASK) { if (regid >= UC_ARM_REG_R0 && regid <= UC_ARM_REG_R12)
if (regid >= UC_ARM_REG_R0 && regid <= UC_ARM_REG_R12) *(int32_t *)value = ARM_CPU(uc, mycpu)->env.regs[regid - UC_ARM_REG_R0];
*(int32_t *)value = ARM_CPU(uc, mycpu)->env.regs[regid - UC_ARM_REG_R0]; else {
else { switch(regid) {
switch(regid) { 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_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]; break;
break; //case UC_ARM_REG_LR:
//case UC_ARM_REG_LR: case UC_ARM_REG_R14:
case UC_ARM_REG_R14: *(int32_t *)value = ARM_CPU(uc, mycpu)->env.regs[14];
*(int32_t *)value = ARM_CPU(uc, mycpu)->env.regs[14]; break;
break; //case UC_ARM_REG_PC:
//case UC_ARM_REG_PC: case UC_ARM_REG_R15:
case UC_ARM_REG_R15: *(int32_t *)value = ARM_CPU(uc, mycpu)->env.regs[15];
*(int32_t *)value = ARM_CPU(uc, mycpu)->env.regs[15]; break;
break;
}
} }
} }
@ -78,24 +76,22 @@ int arm_reg_write(struct uc_struct *uc, unsigned int regid, const void *value)
{ {
CPUState *mycpu = first_cpu; CPUState *mycpu = first_cpu;
if (!(uc->mode & ~UC_MODE_ARM_MASK) { if (regid >= UC_ARM_REG_R0 && regid <= UC_ARM_REG_R12)
if (regid >= UC_ARM_REG_R0 && regid <= UC_ARM_REG_R12) ARM_CPU(uc, mycpu)->env.regs[regid - UC_ARM_REG_R0] = *(uint32_t *)value;
ARM_CPU(uc, mycpu)->env.regs[regid - UC_ARM_REG_R0] = *(uint32_t *)value; else {
else { switch(regid) {
switch(regid) { //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; break;
break; //case UC_ARM_REG_LR:
//case UC_ARM_REG_LR: case UC_ARM_REG_R14:
case UC_ARM_REG_R14: ARM_CPU(uc, mycpu)->env.regs[14] = *(uint32_t *)value;
ARM_CPU(uc, mycpu)->env.regs[14] = *(uint32_t *)value; break;
break; //case UC_ARM_REG_PC:
//case UC_ARM_REG_PC: case UC_ARM_REG_R15:
case UC_ARM_REG_R15: ARM_CPU(uc, mycpu)->env.regs[15] = *(uint32_t *)value;
ARM_CPU(uc, mycpu)->env.regs[15] = *(uint32_t *)value; break;
break;
}
} }
} }