From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13487 invoked by alias); 16 Oct 2013 09:39:20 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 13471 invoked by uid 89); 16 Oct 2013 09:39:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mms1.broadcom.com Received: from mms1.broadcom.com (HELO mms1.broadcom.com) (216.31.210.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 16 Oct 2013 09:39:18 +0000 Received: from [10.9.208.53] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Wed, 16 Oct 2013 02:39:02 -0700 X-Server-Uuid: 06151B78-6688-425E-9DE2-57CB27892261 Received: from IRVEXCHSMTP1.corp.ad.broadcom.com (10.9.207.51) by IRVEXCHCAS06.corp.ad.broadcom.com (10.9.208.53) with Microsoft SMTP Server (TLS) id 14.1.438.0; Wed, 16 Oct 2013 02:39:04 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP1.corp.ad.broadcom.com (10.9.207.51) with Microsoft SMTP Server id 14.1.438.0; Wed, 16 Oct 2013 02:39:04 -0700 Received: from [10.177.73.67] (unknown [10.177.73.67]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id BF5D4246A6 for ; Wed, 16 Oct 2013 02:39:03 -0700 (PDT) Message-ID: <525E5EB6.4070305@broadcom.com> Date: Wed, 16 Oct 2013 09:39:00 -0000 From: "Andrew Burgess" User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: "gdb-patches@sourceware.org" Subject: [PATCH] hardware watchpoints turned off, inferior not yet started Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2013-10/txt/msg00477.txt.bz2 The following seems confusing to me: $ gdb -q watch.x Reading symbols from /some/path/to/watch.x...done. (gdb) set can-use-hw-watchpoints 0 (gdb) watch -l my_var Hardware watchpoint 1: -location my_var (gdb) Notice that despite turning hardware watchpoints off the watchpoint created is reported to be a hardware watchpoint. Once I actually start the inferior the watchpoint is downgraded to a software watchpoint, but still, this feels like it might cause confusion, and is pretty easy to fix. OK to apply? Thanks, Andrew gdb/ChangeLog 2013-10-16 Andrew Burgess * breakpoint.c (update_watchpoint): Create software watchpoints if the inferior has not yet started and hardware watchpoints are turned off. gdb/testsuite/ChangeLog 2013-10-16 Andrew Burgess * gdb.base/watchpoints.exp: Add test for setting software watchpoint before starting the inferior. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 5ce50de..2902dc1 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1800,6 +1800,8 @@ update_watchpoint (struct watchpoint *b, int reparse) /* Without execution, memory can't change. No use to try and set watchpoint locations. The watchpoint will be reset when the target gains execution, through breakpoint_re_set. */ + if (!can_use_hw_watchpoints) + b->base.type = bp_watchpoint; } else if (within_current_scope && b->exp) { diff --git a/gdb/testsuite/gdb.base/watchpoints.exp b/gdb/testsuite/gdb.base/watchpoints.exp index 7c10d81..2442bcd 100644 --- a/gdb/testsuite/gdb.base/watchpoints.exp +++ b/gdb/testsuite/gdb.base/watchpoints.exp @@ -29,6 +29,17 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { return -1 } + # Ensure that if we turn off hardware watchpoints and set a watch point + # before starting the inferior the watchpoint created will not be a + # hardware watchpoint. + gdb_test_no_output "set can-use-hw-watchpoints 0" "" + gdb_test "watch ival1" "Watchpoint \[0-9\]+: ival1" \ + "Set software watchpoint before starting the inferior" + + # This will turn hardware watchpoints back on and delete the watchpoint + # we just created. + clean_restart ${binfile} + # Disable hardware watchpoints if necessary. if [target_info exists gdb,no_hardware_watchpoints] { gdb_test_no_output "set can-use-hw-watchpoints 0" ""