From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16845 invoked by alias); 6 Jan 2009 01:47:40 -0000 Received: (qmail 16837 invoked by uid 22791); 6 Jan 2009 01:47:39 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_05,UNPARSEABLE_RELAY X-Spam-Check-By: sourceware.org Received: from inet-tsb5.toshiba.co.jp (HELO imx2.toshiba.co.jp) (202.33.96.24) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 06 Jan 2009 01:47:31 +0000 Received: from arc1.toshiba.co.jp ([133.199.194.235]) by imx2.toshiba.co.jp with ESMTP id n061l3H0022545; Tue, 6 Jan 2009 10:47:03 +0900 (JST) Received: (from root@localhost) by arc1.toshiba.co.jp id n061l3pB003371; Tue, 6 Jan 2009 10:47:03 +0900 (JST) Received: from unknown [133.199.192.144] by arc1.toshiba.co.jp with ESMTP id LAA03370; Tue, 6 Jan 2009 10:47:03 +0900 Received: from mx.toshiba.co.jp (localhost [127.0.0.1]) by ovp2.toshiba.co.jp with ESMTP id n061l26g011137; Tue, 6 Jan 2009 10:47:02 +0900 (JST) Received: from mx.tjsys.co.jp by toshiba.co.jp id n061l12p021716; Tue, 6 Jan 2009 10:47:01 +0900 (JST) Received: from voltage-out.tjsys.co.jp (voltage-out.tjsys.co.jp [157.79.3.51]) by mx.tjsys.co.jp (8.12.11/8.12.11) with ESMTP id n061l14p015781; Tue, 6 Jan 2009 10:47:01 +0900 (JST) Received: from is-com10 ([157.79.3.71]) by voltage-out.tjsys.co.jp (8.13.1/8.13.1) with SMTP id n061ktAG003855; Tue, 6 Jan 2009 10:46:55 +0900 Received: from localhost ([157.79.30.228]) by ims.tjsys.co.jp (iPlanet Messaging Server 5.2 HotFix 2.10 (built Dec 26 2005)) with ESMTP id <0KD10012K0Y5Q1@ims.tjsys.co.jp>; Tue, 06 Jan 2009 10:46:53 +0900 (JST) Date: Tue, 06 Jan 2009 01:47:00 -0000 From: Emi SUZUKI Subject: Re: Watchpoint on an unloaded shared library(1) In-reply-to: <20081228111719.GC4216@adacore.com> To: brobecker@adacore.com Cc: gdb-patches@sourceware.org Message-id: <20090106.104717.01369292.emi-suzuki@tjsys.co.jp> MIME-version: 1.0 Content-type: Text/Plain; charset=us-ascii Content-transfer-encoding: 7bit References: <20081226061055.GA4216@adacore.com> <20081226.160820.01367812.emi-suzuki@tjsys.co.jp> <20081228111719.GC4216@adacore.com> X-WAuditID: 0901061046530000001202 X-IsSubscribed: yes 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 X-SW-Source: 2009-01/txt/msg00037.txt.bz2 Hello Joel, From: Joel Brobecker Subject: Re: Watchpoint on an unloaded shared library(1) Date: Sun, 28 Dec 2008 15:17:19 +0400 > However, you did not say whether you tested the change (meaning that > you verified that it does not introduce any new failure in the GDB > testsuite), and if you did, on which system. I just want to make > sure the change was properly tested before it is checked in. OK, I would mention it from now on. >> + struct gdb_exception e; >> + TRY_CATCH (e, RETURN_MASK_ALL) > > Can you add an empty line between these two line. The style in GDB > is to separate the local variable declarations from the rest of > the code by an empty line. The below is the reviced one. I've tested it on x86-linux (F9) and seen no regression. Thank you for all of your valuable advices for this issue! 2008-12-26 Joel Brobecker Emi Suzuki * breakpoint.c (do_enable_breakpoint): Use update_watchpoint for watchpoints. --- breakpoint.c.orig 2009-01-03 14:57:50.000000000 +0900 +++ breakpoint.c 2009-01-05 14:34:01.000000000 +0900 @@ -7789,56 +7789,18 @@ do_enable_breakpoint (struct breakpoint bpt->type == bp_read_watchpoint || bpt->type == bp_access_watchpoint) { - struct frame_id saved_frame_id; - - saved_frame_id = get_frame_id (get_selected_frame (NULL)); - if (bpt->exp_valid_block != NULL) + struct gdb_exception e; + + TRY_CATCH (e, RETURN_MASK_ALL) { - struct frame_info *fr = - fr = frame_find_by_id (bpt->watchpoint_frame); - if (fr == NULL) - { - printf_filtered (_("\ -Cannot enable watchpoint %d because the block in which its expression\n\ -is valid is not currently in scope.\n"), bpt->number); - return; - } - select_frame (fr); + update_watchpoint (bpt, 1 /* reparse */); } - - if (bpt->val) - value_free (bpt->val); - mark = value_mark (); - fetch_watchpoint_value (bpt->exp, &bpt->val, NULL, NULL); - if (bpt->val) - release_value (bpt->val); - bpt->val_valid = 1; - - if (bpt->type == bp_hardware_watchpoint || - bpt->type == bp_read_watchpoint || - bpt->type == bp_access_watchpoint) + if (e.reason < 0) { - int i = hw_watchpoint_used_count (bpt->type, &other_type_used); - int mem_cnt = can_use_hardware_watchpoint (bpt->val); - - /* Hack around 'unused var' error for some targets here */ - (void) mem_cnt, (void) i; - target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT ( - bpt->type, i + mem_cnt, other_type_used); - /* we can consider of type is bp_hardware_watchpoint, convert to - bp_watchpoint in the following condition */ - if (target_resources_ok < 0) - { - printf_filtered (_("\ -Cannot enable watchpoint %d because target watch resources\n\ -have been allocated for other watchpoints.\n"), bpt->number); - value_free_to_mark (mark); - return; - } + exception_fprintf (gdb_stderr, e, _("Cannot enable watchpoint %d: "), + bpt->number); + return; } - - select_frame (frame_find_by_id (saved_frame_id)); - value_free_to_mark (mark); } if (bpt->enable_state != bp_permanent) My best regards, -- Emi SUZUKI / emi-suzuki at tjsys.co.jp