Merge branch 'master' of https://github.com/esanfelix/unicorn into esanfelix-master
This commit is contained in:
@ -106,8 +106,9 @@ int arm_reg_write(struct uc_struct *uc, unsigned int *regs, void* const* vals, i
|
|||||||
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.pc = *(uint32_t *)value;
|
ARM_CPU(uc, mycpu)->env.pc = (*(uint32_t *)value & ~1);
|
||||||
ARM_CPU(uc, mycpu)->env.regs[15] = *(uint32_t *)value;
|
ARM_CPU(uc, mycpu)->env.thumb = (*(uint32_t *)value & 1);
|
||||||
|
ARM_CPU(uc, mycpu)->env.regs[15] = (*(uint32_t *)value & ~1);
|
||||||
// force to quit execution and flush TB
|
// force to quit execution and flush TB
|
||||||
uc->quit_request = true;
|
uc->quit_request = true;
|
||||||
uc_emu_stop(uc);
|
uc_emu_stop(uc);
|
||||||
|
Reference in New Issue
Block a user