aboutsummaryrefslogtreecommitdiff
path: root/accel
diff options
context:
space:
mode:
authorLuc Michel <lmichel@kalray.eu>2022-02-24 14:52:42 -1000
committerRichard Henderson <richard.henderson@linaro.org>2022-02-28 08:04:06 -1000
commit5b7b197c87cefbd24bd1936614fd4e00ccc279ab (patch)
tree7db1adc3806b5d8482baf480ef4d1f76bf9029ce /accel
parent8929906e212cbe606e361cbd32917dcbe5bb6dd0 (diff)
downloadqemu-5b7b197c87cefbd24bd1936614fd4e00ccc279ab.zip
qemu-5b7b197c87cefbd24bd1936614fd4e00ccc279ab.tar.gz
qemu-5b7b197c87cefbd24bd1936614fd4e00ccc279ab.tar.bz2
accel/tcg/cpu-exec: Fix precise single-stepping after interrupt
In some cases, cpu->exit_request can be false after handling the interrupt, leading to another TB being executed instead of returning to the main loop. Fix this by returning true unconditionally when in single-step mode. Fixes: ba3c35d9c402 ("tcg/cpu-exec: precise single-stepping after an interrupt") Signed-off-by: Luc Michel <lmichel@kalray.eu> Message-Id: <20220214132656.11397-1-lmichel@kalray.eu> [rth: Unlock iothread mutex; simplify indentation] Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'accel')
-rw-r--r--accel/tcg/cpu-exec.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 8da6a55..c68270f 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -799,8 +799,12 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,
* raised when single-stepping so that GDB doesn't miss the
* next instruction.
*/
- cpu->exception_index =
- (cpu->singlestep_enabled ? EXCP_DEBUG : -1);
+ if (unlikely(cpu->singlestep_enabled)) {
+ cpu->exception_index = EXCP_DEBUG;
+ qemu_mutex_unlock_iothread();
+ return true;
+ }
+ cpu->exception_index = -1;
*last_tb = NULL;
}
/* The target hook may have updated the 'cpu->interrupt_request';