[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/25] hw/nios2: exit to main CPU loop only when unmasking interru
From: |
Peter Maydell |
Subject: |
[PULL 20/25] hw/nios2: exit to main CPU loop only when unmasking interrupts |
Date: |
Mon, 13 Jul 2020 15:10:59 +0100 |
From: Wentong Wu <wentong.wu@intel.com>
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>
---
hw/nios2/cpu_pic.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/nios2/cpu_pic.c b/hw/nios2/cpu_pic.c
index 1c1989d56a0..5ea7e52ab83 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);
}
--
2.20.1
- [PULL 14/25] util/compatfd.c: Only include <sys/syscall.h> if CONFIG_SIGNALFD, (continued)
- [PULL 14/25] util/compatfd.c: Only include <sys/syscall.h> if CONFIG_SIGNALFD, Peter Maydell, 2020/07/13
- [PULL 13/25] bswap.h: Include <endian.h> on Haiku for bswap operations, Peter Maydell, 2020/07/13
- [PULL 15/25] util/oslib-posix.c: Implement qemu_init_exec_dir() for Haiku, Peter Maydell, 2020/07/13
- [PULL 16/25] util/drm: make portable by avoiding struct dirent d_type, Peter Maydell, 2020/07/13
- [PULL 18/25] target/nios2: in line the semantics of DISAS_UPDATE with other targets, Peter Maydell, 2020/07/13
- [PULL 17/25] target/nios2: add DISAS_NORETURN case for nothing more to generate, Peter Maydell, 2020/07/13
- [PULL 22/25] hw/arm/tosa: Encapsulate misc GPIO handling in a device, Peter Maydell, 2020/07/13
- [PULL 21/25] hw/arm/tosa.c: Detabify, Peter Maydell, 2020/07/13
- [PULL 23/25] hw/arm/palm.c: Detabify, Peter Maydell, 2020/07/13
- [PULL 19/25] target/nios2: Use gen_io_start around wrctl instruction, Peter Maydell, 2020/07/13
- [PULL 20/25] hw/nios2: exit to main CPU loop only when unmasking interrupts,
Peter Maydell <=
- [PULL 24/25] hw/arm/palm.c: Encapsulate misc GPIO handling in a device, Peter Maydell, 2020/07/13
- [PULL 25/25] hw/arm/aspeed: Do not create and attach empty SD cards by default, Peter Maydell, 2020/07/13
- Re: [PULL 00/25] target-arm queue, Peter Maydell, 2020/07/13