diff options
| author | Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> | 2021-10-28 14:48:05 +0300 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-10-28 20:55:07 -0700 |
| commit | 9f660c077b53f58792b6fa6a45b2c3eb1e25b716 (patch) | |
| tree | fed811078ff9cb38ef2bb19735d88f978982adb2 | |
| parent | 93a967fbb571ae34857c769dbf0bcc08f2286328 (diff) | |
| download | focaccia-qemu-9f660c077b53f58792b6fa6a45b2c3eb1e25b716.tar.gz focaccia-qemu-9f660c077b53f58792b6fa6a45b2c3eb1e25b716.zip | |
softmmu: fix watchpoint processing in icount mode
Watchpoint processing code restores vCPU state twice: in tb_check_watchpoint and in cpu_loop_exit_restore/cpu_restore_state. Normally it does not affect anything, but in icount mode instruction counter is incremented twice and becomes incorrect. This patch eliminates unneeded CPU state restore. Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru> Reviewed-by: David Hildenbrand <david@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <163542168516.2127597.8781375223437124644.stgit@pasha-ThinkPad-X280> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | softmmu/physmem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 555c907f67..d58752678d 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -938,18 +938,16 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, cpu->watchpoint_hit = wp; mmap_lock(); + /* This call also restores vCPU state */ tb_check_watchpoint(cpu, ra); if (wp->flags & BP_STOP_BEFORE_ACCESS) { cpu->exception_index = EXCP_DEBUG; mmap_unlock(); - cpu_loop_exit_restore(cpu, ra); + cpu_loop_exit(cpu); } else { /* Force execution of one insn next time. */ cpu->cflags_next_tb = 1 | curr_cflags(cpu); mmap_unlock(); - if (ra) { - cpu_restore_state(cpu, ra, true); - } cpu_loop_exit_noexc(cpu); } } |