From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RrKN6-0006jj-OV for qemu-devel@nongnu.org; Sat, 28 Jan 2012 21:20:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RrKN5-0001Ra-Sc for qemu-devel@nongnu.org; Sat, 28 Jan 2012 21:20:00 -0500 Received: from mail-bk0-f45.google.com ([209.85.214.45]:55149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RrKN5-0001QV-In for qemu-devel@nongnu.org; Sat, 28 Jan 2012 21:19:59 -0500 Received: by mail-bk0-f45.google.com with SMTP id zu17so2552595bkb.4 for ; Sat, 28 Jan 2012 18:19:59 -0800 (PST) From: Max Filippov Date: Sun, 29 Jan 2012 06:19:27 +0400 Message-Id: <1327803571-30553-6-git-send-email-jcmvbkbc@gmail.com> In-Reply-To: <1327803571-30553-1-git-send-email-jcmvbkbc@gmail.com> References: <1327803571-30553-1-git-send-email-jcmvbkbc@gmail.com> Subject: [Qemu-devel] [RFC 5/9] exec: fix check_watchpoint exiting cpu_loop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jcmvbkbc@gmail.com In case of BP_STOP_BEFORE_ACCESS watchpoint check_watchpoint intends to signal EXCP_DEBUG exception on exit from cpu loop, but later overwrites exception code by the cpu_resume_from_signal call. Use cpu_loop_exit with BP_STOP_BEFORE_ACCESS watchpoints. Signed-off-by: Max Filippov --- exec.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/exec.c b/exec.c index 0e93e0e..bc6c185 100644 --- a/exec.c +++ b/exec.c @@ -3247,11 +3247,12 @@ static void check_watchpoint(int offset, int len_mask, int flags) tb_phys_invalidate(tb, -1); if (wp->flags & BP_STOP_BEFORE_ACCESS) { env->exception_index = EXCP_DEBUG; + cpu_loop_exit(env); } else { cpu_get_tb_cpu_state(env, &pc, &cs_base, &cpu_flags); tb_gen_code(env, pc, cs_base, cpu_flags, 1); + cpu_resume_from_signal(env, NULL); } - cpu_resume_from_signal(env, NULL); } } else { wp->flags &= ~BP_WATCHPOINT_HIT; -- 1.7.7.6