diff options
| author | Wentong Wu | 2020-07-13 15:36:11 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-07-13 15:36:11 +0200 |
| commit | 77b3f2af57a37b1c30174a911e03d6ff715ef4aa (patch) | |
| tree | 39e2d2b38bb967d4d7a753fe490c71a9ef64b0ea | |
| parent | target/nios2: in line the semantics of DISAS_UPDATE with other targets (diff) | |
| download | qemu-77b3f2af57a37b1c30174a911e03d6ff715ef4aa.tar.gz qemu-77b3f2af57a37b1c30174a911e03d6ff715ef4aa.tar.xz qemu-77b3f2af57a37b1c30174a911e03d6ff715ef4aa.zip | |
target/nios2: Use gen_io_start around wrctl instruction
wrctl instruction on nios2 target will cause checking cpu
interrupt but tcg_handle_interrupt() will call cpu_abort()
if the CPU gets an interrupt while it's not in 'can do IO'
state, so add gen_io_start around wrctl instruction. Also
at the same time, end the onging TB with DISAS_UPDATE.
Signed-off-by: Wentong Wu <wentong.wu@intel.com>
Message-id: 20200710233433.19729-3-wentong.wu@intel.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/nios2/translate.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/target/nios2/translate.c b/target/nios2/translate.c index c2a134f932..9824544eb3 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -32,6 +32,7 @@ #include "exec/cpu_ldst.h" #include "exec/translator.h" #include "qemu/qemu-print.h" +#include "exec/gen-icount.h" /* is_jmp field values */ #define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */ @@ -518,7 +519,11 @@ static void wrctl(DisasContext *dc, uint32_t code, uint32_t flags) /* If interrupts were enabled using WRCTL, trigger them. */ #if !defined(CONFIG_USER_ONLY) if ((instr.imm5 + CR_BASE) == CR_STATUS) { + if (tb_cflags(dc->tb) & CF_USE_ICOUNT) { + gen_io_start(); + } gen_helper_check_interrupts(dc->cpu_env); + dc->is_jmp = DISAS_UPDATE; } #endif } |