diff options
| author | Wentong Wu <wentong.wu@intel.com> | 2020-07-13 14:36:11 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-13 14:36:11 +0100 |
| commit | dcef727e5e45f679908c90a7ff3b816c5d61f602 (patch) | |
| tree | 3e4e84d9b9a082142d6ba2e0b73ce49719736048 | |
| parent | 77b3f2af57a37b1c30174a911e03d6ff715ef4aa (diff) | |
| download | focaccia-qemu-dcef727e5e45f679908c90a7ff3b816c5d61f602.tar.gz focaccia-qemu-dcef727e5e45f679908c90a7ff3b816c5d61f602.zip | |
hw/nios2: exit to main CPU loop only when unmasking interrupts
Only when guest code is unmasking interrupts, terminate the excution of translated code and exit to the main CPU loop to handle previous pended interrupts because of the interrupts mask by guest code. Signed-off-by: Wentong Wu <wentong.wu@intel.com> Message-id: 20200710233433.19729-4-wentong.wu@intel.com Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/nios2/cpu_pic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/nios2/cpu_pic.c b/hw/nios2/cpu_pic.c index 1c1989d56a..5ea7e52ab8 100644 --- a/hw/nios2/cpu_pic.c +++ b/hw/nios2/cpu_pic.c @@ -54,7 +54,8 @@ static void nios2_pic_cpu_handler(void *opaque, int irq, int level) void nios2_check_interrupts(CPUNios2State *env) { - if (env->irq_pending) { + if (env->irq_pending && + (env->regs[CR_STATUS] & CR_STATUS_PIE)) { env->irq_pending = 0; cpu_interrupt(env_cpu(env), CPU_INTERRUPT_HARD); } |