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

target/arm: Exit after clearing aarch64 interrupt mask

Browse source 
Exit to cpu loop so we reevaluate cpu_arm_hw_interrupts.

Backports commit 8da54b2507c1cabf60c2de904cf0383b23239231 from qemu
This commit is contained in:
Richard Henderson 2018-03-03 17:18:34 -05:00 committed by Lioncash
parent dd1473f582
commit 42bb73fa96
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qemu/target/arm/translate-a64.c
View file

@ -1465,7 +1465,9 @@ static void handle_msr_i(DisasContext *s, uint32_t insn,
gen_helper_msr_i_pstate(tcg_ctx, tcg_ctx->cpu_env, tcg_op, tcg_imm); gen_helper_msr_i_pstate(tcg_ctx, tcg_ctx->cpu_env, tcg_op, tcg_imm);
tcg_temp_free_i32(tcg_ctx, tcg_imm); tcg_temp_free_i32(tcg_ctx, tcg_imm);
tcg_temp_free_i32(tcg_ctx, tcg_op); tcg_temp_free_i32(tcg_ctx, tcg_op);
s->is_jmp = DISAS_UPDATE; /* For DAIFClear, exit the cpu loop to re-evaluate pending IRQs. */
gen_a64_set_pc_im(s, s->pc);
s->is_jmp = (op == 0x1f ? DISAS_EXIT : DISAS_JUMP);
break; break;
} }
default: default:
@ -11614,6 +11616,9 @@ tb_end:
case DISAS_JUMP: case DISAS_JUMP:
tcg_gen_lookup_and_goto_ptr(tcg_ctx, tcg_ctx->cpu_pc); tcg_gen_lookup_and_goto_ptr(tcg_ctx, tcg_ctx->cpu_pc);
break; break;
case DISAS_EXIT:
tcg_gen_exit_tb(tcg_ctx, 0);
break;
case DISAS_TB_JUMP: case DISAS_TB_JUMP:
case DISAS_EXC: case DISAS_EXC:
case DISAS_SWI: case DISAS_SWI: