diff --git a/qemu/target/arm/helper.c b/qemu/target/arm/helper.c index afb4a951..ae13fb44 100644 --- a/qemu/target/arm/helper.c +++ b/qemu/target/arm/helper.c @@ -6371,11 +6371,12 @@ static void do_v7m_exception_exit(ARMCPU *cpu) * returning to -- none of the state we would unstack or set based on * the EXCRET value affects it. */ - if (armv7m_nvic_can_take_pending_exception(env->nvic)) { + // Unicorn: commented out + /*if (armv7m_nvic_can_take_pending_exception(env->nvic)) { qemu_log_mask(CPU_LOG_INT, "...tailchaining to pending exception\n"); v7m_exception_taken(cpu, excret, true, false); return; - } + }*/ switch_v7m_security_state(env, return_to_secure);