From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16864 invoked by alias); 15 Feb 2008 04:01:39 -0000 Received: (qmail 16853 invoked by uid 22791); 15 Feb 2008 04:01:38 -0000 X-Spam-Check-By: sourceware.org Received: from viper.snap.net.nz (HELO viper.snap.net.nz) (202.37.101.8) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 15 Feb 2008 04:01:11 +0000 Received: from kahikatea.snap.net.nz (121.31.255.123.static.snap.net.nz [123.255.31.121]) by viper.snap.net.nz (Postfix) with ESMTP id 3F3BF3DA9DC; Fri, 15 Feb 2008 17:01:08 +1300 (NZDT) Received: by kahikatea.snap.net.nz (Postfix, from userid 1000) id A6E218FC6D; Fri, 15 Feb 2008 17:01:01 +1300 (NZDT) From: Nick Roberts MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <18357.3708.628053.809241@kahikatea.snap.net.nz> Date: Fri, 15 Feb 2008 04:01:00 -0000 To: Joel Brobecker Cc: Vladimir Prus , gdb-patches@sourceware.org Subject: Re: (gdb-6.8) Discard breakpoint address if shared library is unloaded In-Reply-To: <20080214214246.GC3713@adacore.com> References: <20080204214226.GF20922@adacore.com> <20080207063817.GA3907@adacore.com> <18347.45621.630420.453287@kahikatea.snap.net.nz> <200802080942.29622.ghost@cs.msu.su> <18348.1691.478013.310214@kahikatea.snap.net.nz> <20080214214246.GC3713@adacore.com> X-Mailer: VM 7.19 under Emacs 22.1.90.2 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: 2008-02/txt/msg00242.txt.bz2 > Can you please resend a new complete patch, with a ChangeLog, and I will > review it. It's much easier that way for me to make sure that what I > think you are proposing is indeed what you are proposing to commit. -- Nick http://www.inet.net.nz/~nickrob 2008-02-15 Nick Roberts * breakpoint.c (print_one_breakpoint_location): Revert Enb field to old format. Discard breakpoint address if shared library is unloaded. (breakpoint_1): Adjust formatting of table header accordingly. *** breakpoint.c 15 Feb 2008 16:52:37 +1300 1.302 --- breakpoint.c 15 Feb 2008 16:55:43 +1300 *************** print_one_breakpoint_location (struct br *** 3426,3448 **** /* 4 */ annotate_field (3); if (part_of_multiple) ! ui_out_field_string (uiout, "enabled", ! loc->shlib_disabled ! ? (loc->enabled ? "y(p)" : "n(p)") ! : (loc->enabled ? "y" : "n")); else ! { ! int pending = (b->loc == NULL || b->loc->shlib_disabled); ! /* For header of multiple, there's no point showing pending ! state -- it will be apparent from the locations. */ ! if (header_of_multiple) ! pending = 0; ! ui_out_field_fmt (uiout, "enabled", "%c%s", ! bpenables[(int) b->enable_state], ! pending ? "(p)" : ""); ! if (!pending) ! ui_out_spaces (uiout, 3); ! } /* 5 and 6 */ --- 3426,3436 ---- /* 4 */ annotate_field (3); if (part_of_multiple) ! ui_out_field_string (uiout, "enabled", loc->enabled ? "y" : "n"); else ! ui_out_field_fmt (uiout, "enabled", "%c", ! bpenables[(int) b->enable_state]); ! ui_out_spaces (uiout, 2); /* 5 and 6 */ *************** print_one_breakpoint_location (struct br *** 3553,3562 **** if (addressprint) { annotate_field (4); ! if (b->loc == NULL) ! ui_out_field_string (uiout, "addr", ""); ! else if (header_of_multiple) ui_out_field_string (uiout, "addr", ""); else ui_out_field_core_addr (uiout, "addr", loc->address); } --- 3541,3550 ---- if (addressprint) { annotate_field (4); ! if (header_of_multiple) ui_out_field_string (uiout, "addr", ""); + if (b->loc == NULL || loc->shlib_disabled) + ui_out_field_string (uiout, "addr", ""); else ui_out_field_core_addr (uiout, "addr", loc->address); } *************** breakpoint_1 (int bnum, int allflag) *** 3781,3787 **** ui_out_table_header (uiout, 4, ui_left, "disp", "Disp"); /* 3 */ if (nr_printable_breakpoints > 0) annotate_field (3); ! ui_out_table_header (uiout, 4, ui_left, "enabled", "Enb"); /* 4 */ if (addressprint) { if (nr_printable_breakpoints > 0) --- 3769,3775 ---- ui_out_table_header (uiout, 4, ui_left, "disp", "Disp"); /* 3 */ if (nr_printable_breakpoints > 0) annotate_field (3); ! ui_out_table_header (uiout, 3, ui_left, "enabled", "Enb"); /* 4 */ if (addressprint) { if (nr_printable_breakpoints > 0)