From 42bb73fa968fc13ba10cd2ab63ae93b55af1d397 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Sat, 3 Mar 2018 17:18:34 -0500 Subject: [PATCH] target/arm: Exit after clearing aarch64 interrupt mask Exit to cpu loop so we reevaluate cpu_arm_hw_interrupts. Backports commit 8da54b2507c1cabf60c2de904cf0383b23239231 from qemu --- qemu/target/arm/translate-a64.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qemu/target/arm/translate-a64.c b/qemu/target/arm/translate-a64.c index 54c4c81a..fa2a0861 100644 --- a/qemu/target/arm/translate-a64.c +++ b/qemu/target/arm/translate-a64.c @@ -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); tcg_temp_free_i32(tcg_ctx, tcg_imm); 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; } default: @@ -11614,6 +11616,9 @@ tb_end: case DISAS_JUMP: tcg_gen_lookup_and_goto_ptr(tcg_ctx, tcg_ctx->cpu_pc); break; + case DISAS_EXIT: + tcg_gen_exit_tb(tcg_ctx, 0); + break; case DISAS_TB_JUMP: case DISAS_EXC: case DISAS_SWI: