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

fix arm64 hang (fix #827) (#828)

Browse Source
This commit is contained in:
Ryan Hileman
2017-05-09 05:19:32 -07:00
committed by Nguyen Anh Quynh
parent b93ca7f565
commit ae6ea3b91d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qemu/target-arm/translate-a64.c
View File

@ -11113,7 +11113,7 @@ void gen_intermediate_code_internal_a64(ARMCPU *cpu,
// imitate WFI instruction to halt emulation // imitate WFI instruction to halt emulation
gen_tb_start(tcg_ctx); gen_tb_start(tcg_ctx);
dc->is_jmp = DISAS_WFI; dc->is_jmp = DISAS_WFI;
goto done_generating; goto tb_end;
} }
// Unicorn: trace this block on request // Unicorn: trace this block on request
@ -11209,6 +11209,7 @@ void gen_intermediate_code_internal_a64(ARMCPU *cpu,
// gen_io_end(); // gen_io_end();
//} //}
tb_end:
if (unlikely(cs->singlestep_enabled || dc->ss_active) if (unlikely(cs->singlestep_enabled || dc->ss_active)
&& dc->is_jmp != DISAS_EXC) { && dc->is_jmp != DISAS_EXC) {
/* Note that this means single stepping WFI doesn't halt the CPU. /* Note that this means single stepping WFI doesn't halt the CPU.