From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12140 invoked by alias); 18 Apr 2002 00:33:52 -0000 Mailing-List: contact gdb-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sources.redhat.com Received: (qmail 12131 invoked from network); 18 Apr 2002 00:33:51 -0000 Received: from unknown (HELO rwcrmhc54.attbi.com) (216.148.227.87) by sources.redhat.com with SMTP; 18 Apr 2002 00:33:51 -0000 Received: from ocean.lucon.org ([12.234.143.38]) by rwcrmhc54.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020418003351.SVWN15826.rwcrmhc54.attbi.com@ocean.lucon.org>; Thu, 18 Apr 2002 00:33:51 +0000 Received: by ocean.lucon.org (Postfix, from userid 1000) id 591A8125C2; Wed, 17 Apr 2002 17:33:50 -0700 (PDT) Date: Wed, 17 Apr 2002 17:33:00 -0000 From: "H . J . Lu" To: Michael Veksler Cc: gdb@sources.redhat.com, Andrew Cagney Subject: PATCH: Fix restarting breakpoint (Re: gdb 5.2 removes the conditional breakpoints) Message-ID: <20020417173349.A6973@lucon.org> References: <3CB3EF53.80608@il.ibm.com> <20020417165756.A6417@lucon.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20020417165756.A6417@lucon.org>; from hjl@lucon.org on Wed, Apr 17, 2002 at 04:57:56PM -0700 X-SW-Source: 2002-04/txt/msg00294.txt.bz2 On Wed, Apr 17, 2002 at 04:57:56PM -0700, H . J . Lu wrote: > On Wed, Apr 10, 2002 at 10:52:51AM +0300, Michael Veksler wrote: > > /References/: <20020322095020.A12445@lucon.org > > > > > <3C9B76F5.6050809@cygnus.com > > > > > > > > > On Fri, Mar 22, 2002 at 01:24:53PM -0500, Andrew Cagney wrote: > > > > When I do > > > > > > > > (gdb) b 100 > > > > (gdb) cond 1 i == 3 > > > > (gdb) r > > > > (gdb) r > > > > > > > > gdb 5.2 will remove the conditional breakpoints on Linux/x86 after I > > > > restart the debug session. Am I the only one who sees it? > > > > > > It would be very helpful if you could illustrate this problem by > > > submitting a real testcase. That way people can run it and check > > > before/after effects on various platforms and GDB releases. > > > > > > > Here are the instructions for reproducing this annoying problem: > > > > // Debugged source: > > typedef int operation(int val); > > > > int f(operation * op, int value) > > { > > return op(value); > > } > > > > int nop(int val) > > { > > return val; > > } > > > > int main() > > { > > return f(nop, 5); > > } > > // End source > > > > Compile it on Linux using gcc 3.0.4 or redhat's 2.96 (did not test it > > on other versions). > > (gdb) b main > > (gdb) r > > Breakpoint 1, main () at t.c:15 > > 15 return f(nop, 5); > > (gdb) s > > f (op=0x8048448 , value=5) at t.c:5 > > 5 return op(value); > > (gdb) b > > Breakpoint 2 at 0x8048432: file t.c, line 5. > > Thanks for the testcase. Basically, we deleted all break points set > with "break" when we restart. It is a very bad regression from gdb > 4.17. Here is a patch. May I check it into gdb 5.2? > > Thanks. > > > H.J. > ---- > 2002-04-17 H.J. Lu (hjl@gnu.org) > > * breakpoint.c (create_thread_event_breakpoint): Use xasprintf. > (create_breakpoints): Make sure the addr_string field is not > NULL. > Here is an update. It just uses xasprintf (&b->addr_string, "*0x%s", paddr (b->address)); H.J. --- 2002-04-17 H.J. Lu (hjl@gnu.org) * breakpoint.c (create_thread_event_breakpoint): Use xasprintf. (create_breakpoints): Make sure the addr_string field is not NULL. --- gdb/breakpoint.c.break Wed Mar 6 22:30:42 2002 +++ gdb/breakpoint.c Wed Apr 17 17:29:58 2002 @@ -3859,14 +3859,12 @@ struct breakpoint * create_thread_event_breakpoint (CORE_ADDR address) { struct breakpoint *b; - char addr_string[80]; /* Surely an addr can't be longer than that. */ b = create_internal_breakpoint (address, bp_thread_event); b->enable_state = bp_enabled; /* addr_string has to be used or breakpoint_re_set will delete me. */ - sprintf (addr_string, "*0x%s", paddr (b->address)); - b->addr_string = xstrdup (addr_string); + xasprintf (&b->addr_string, "*0x%s", paddr (b->address)); return b; } @@ -4422,7 +4420,12 @@ create_breakpoints (struct symtabs_and_l b->number = breakpoint_count; b->cond = cond[i]; b->thread = thread; - b->addr_string = addr_string[i]; + if (addr_string[i]) + b->addr_string = addr_string[i]; + else + /* addr_string has to be used or breakpoint_re_set will delete + me. */ + xasprintf (&b->addr_string, "*0x%s", paddr (b->address)); b->cond_string = cond_string[i]; b->ignore_count = ignore_count; b->enable_state = bp_enabled;