From patchwork Sat Feb 18 17:11:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 142040 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 79000B6F9B for ; Sun, 19 Feb 2012 04:51:21 +1100 (EST) Received: from localhost ([::1]:56975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rynq6-0005FC-Pp for incoming@patchwork.ozlabs.org; Sat, 18 Feb 2012 12:12:50 -0500 Received: from eggs.gnu.org ([140.186.70.92]:50342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rynpf-0004lo-0b for qemu-devel@nongnu.org; Sat, 18 Feb 2012 12:12:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rynpd-0005qf-MP for qemu-devel@nongnu.org; Sat, 18 Feb 2012 12:12:22 -0500 Received: from mail-bk0-f45.google.com ([209.85.214.45]:63774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rynpd-0005kY-9Y for qemu-devel@nongnu.org; Sat, 18 Feb 2012 12:12:21 -0500 Received: by mail-bk0-f45.google.com with SMTP id e19so4291536bku.4 for ; Sat, 18 Feb 2012 09:12:20 -0800 (PST) Received-SPF: pass (google.com: domain of jcmvbkbc@gmail.com designates 10.204.128.202 as permitted sender) client-ip=10.204.128.202; Authentication-Results: mr.google.com; spf=pass (google.com: domain of jcmvbkbc@gmail.com designates 10.204.128.202 as permitted sender) smtp.mail=jcmvbkbc@gmail.com; dkim=pass header.i=jcmvbkbc@gmail.com Received: from mr.google.com ([10.204.128.202]) by 10.204.128.202 with SMTP id l10mr7565710bks.116.1329585140976 (num_hops = 1); Sat, 18 Feb 2012 09:12:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=jxoQADLAPYFdrRHpDdiQArZ4CavcxxiDcmYcYblj0TM=; b=dd2TWGsbLM0S7CyArmMXvxxuJlpM/7GjmZTLaezQA4a5r/jo+9CAHW+IoRYXYggpV/ UE9ey9XAwXtGviRVdyFtqzmL33SDiI/ZJw1EkcPhxb7P4TuDwDquB97piLVYhmRn0OLB bI78f0u38sAFJLPrg1VjPb3sqz5yMFuAlQvfY= Received: by 10.204.128.202 with SMTP id l10mr6120548bks.116.1329585140893; Sat, 18 Feb 2012 09:12:20 -0800 (PST) Received: from octofox.metropolis ([188.134.19.124]) by mx.google.com with ESMTPS id o7sm28887600bkw.16.2012.02.18.09.12.19 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 18 Feb 2012 09:12:20 -0800 (PST) From: Max Filippov To: qemu-devel@nongnu.org Date: Sat, 18 Feb 2012 21:11:39 +0400 Message-Id: <1329585103-31371-8-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1329585103-31371-1-git-send-email-jcmvbkbc@gmail.com> References: <1329564636-29883-1-git-send-email-jcmvbkbc@gmail.com> <1329585103-31371-1-git-send-email-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.45 Cc: blauwirbel@gmail.com, Max Filippov , aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 08/12] exec: fix check_watchpoint exiting cpu_loop X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 f105b43..ed091f3 100644 --- a/exec.c +++ b/exec.c @@ -3257,11 +3257,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;