yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix pausing within Thumb2 ITE blocks (#853) (#880)

Browse Source 
Co-authored-by: Rami Ali <flowergrass@users.noreply.github.com>
This commit is contained in:
Rami Ali
2021-03-30 01:54:45 +11:00
committed by GitHub
parent 7ca7e8a79d
commit 34ddafcbcf
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
qemu/target-arm/translate.c
View File

@ -10434,17 +10434,23 @@ static void disas_thumb_insn(CPUARMState *env, DisasContext *s) // qq
// Unicorn: trace this instruction on request // Unicorn: trace this instruction on request
if (HOOK_EXISTS_BOUNDED(s->uc, UC_HOOK_CODE, s->pc)) { if (HOOK_EXISTS_BOUNDED(s->uc, UC_HOOK_CODE, s->pc)) {
// determine instruction size (Thumb/Thumb2) // determine instruction size (Thumb/Thumb2)
switch(insn & 0xf800) { // avoid terminating inside ITE clause
// Thumb2: 32-bit if (s->condexec_mask == 0) {
case 0xe800: switch(insn & 0xf800) {
case 0xf000: // Thumb2: 32-bit
case 0xf800: case 0xe800:
gen_uc_tracecode(tcg_ctx, 4, UC_HOOK_CODE_IDX, s->uc, s->pc); case 0xf000:
break; case 0xf800:
// Thumb: 16-bit gen_uc_tracecode(tcg_ctx, 4, UC_HOOK_CODE_IDX, s->uc, s->pc);
default: break;
gen_uc_tracecode(tcg_ctx, 2, UC_HOOK_CODE_IDX, s->uc, s->pc); // Thumb: 16-bit
break; default:
// avoid terminating at an IT instruction
if (!((insn & 0xff00) == 0xbf00)) {
gen_uc_tracecode(tcg_ctx, 2, UC_HOOK_CODE_IDX, s->uc, s->pc);
}
break;
}
} }
// the callback might want to stop emulation immediately // the callback might want to stop emulation immediately
check_exit_request(tcg_ctx); check_exit_request(tcg_ctx);