diff options
| author | Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> | 2022-01-31 14:25:40 +0300 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2022-02-09 08:55:02 +1100 |
| commit | c3e97f640642d6ea11cddc1ed9d4d68d180eb18a (patch) | |
| tree | d0bbb90a8793be0d99dd411dafe511ebd02514f5 | |
| parent | 25e82fb769eddb83e0b68487b8b08d9426704d54 (diff) | |
| download | focaccia-qemu-c3e97f640642d6ea11cddc1ed9d4d68d180eb18a.tar.gz focaccia-qemu-c3e97f640642d6ea11cddc1ed9d4d68d180eb18a.zip | |
replay: use CF_NOIRQ for special exception-replaying TB
Commit aff0e204cb1f1c036a496c94c15f5dfafcd9b4b4 introduced CF_NOIRQ usage, but one case was forgotten. Record/replay uses one special TB which is not really executed, but used to cause a correct exception in replay mode. This patch adds CF_NOIRQ flag for such block. Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <164362834054.1754532.7678416881159817273.stgit@pasha-ThinkPad-X280> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | accel/tcg/cpu-exec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 8b4cd6c59d..8da6a55593 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -648,7 +648,8 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret) if (replay_has_exception() && cpu_neg(cpu)->icount_decr.u16.low + cpu->icount_extra == 0) { /* Execute just one insn to trigger exception pending in the log */ - cpu->cflags_next_tb = (curr_cflags(cpu) & ~CF_USE_ICOUNT) | 1; + cpu->cflags_next_tb = (curr_cflags(cpu) & ~CF_USE_ICOUNT) + | CF_NOIRQ | 1; } #endif return false; |