diff options
| author | Max Filippov | 2020-07-06 02:31:59 +0200 |
|---|---|---|
| committer | Max Filippov | 2020-08-21 21:48:14 +0200 |
| commit | a7d479ee51c5911c93ee931efe4c2413b54c8756 (patch) | |
| tree | b20ef102ab90ee39b39f71df5208f08899bf5c42 /hw/xtensa | |
| parent | target/xtensa: make opcode properties more dynamic (diff) | |
| download | qemu-a7d479ee51c5911c93ee931efe4c2413b54c8756.tar.gz qemu-a7d479ee51c5911c93ee931efe4c2413b54c8756.tar.xz qemu-a7d479ee51c5911c93ee931efe4c2413b54c8756.zip | |
target/xtensa: implement NMI support
When NMI is configured it is taken regardless of INTENABLE SR contents,
PS.INTLEVEL or PS.EXCM. It is cleared automatically once it's taken.
Add nmi_level to XtensaConfig, puth there NMI level from the overlay or
XCHAL_NUM_INTLEVELS + 1 when NMI is not configured. Add NMI mask to
INTENABLE SR and limit CINTLEVEL to nmi_level - 1 when determining
pending IRQ level in check_interrupt(). Always take and clear pending
interrupt at nmi_level in the handle_interrupt().
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'hw/xtensa')
| -rw-r--r-- | hw/xtensa/pic_cpu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c index edd53c9241..1d5982a9e4 100644 --- a/hw/xtensa/pic_cpu.c +++ b/hw/xtensa/pic_cpu.c @@ -35,9 +35,13 @@ void check_interrupts(CPUXtensaState *env) { CPUState *cs = env_cpu(env); int minlevel = xtensa_get_cintlevel(env); - uint32_t int_set_enabled = env->sregs[INTSET] & env->sregs[INTENABLE]; + uint32_t int_set_enabled = env->sregs[INTSET] & + (env->sregs[INTENABLE] | env->config->inttype_mask[INTTYPE_NMI]); int level; + if (minlevel >= env->config->nmi_level) { + minlevel = env->config->nmi_level - 1; + } for (level = env->config->nlevel; level > minlevel; --level) { if (env->config->level_mask[level] & int_set_enabled) { env->pending_irq_level = level; |