From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24485 invoked by alias); 8 Nov 2007 08:56:01 -0000 Received: (qmail 24473 invoked by uid 22791); 8 Nov 2007 08:56:00 -0000 X-Spam-Check-By: sourceware.org Received: from zigzag.lvk.cs.msu.su (HELO zigzag.lvk.cs.msu.su) (158.250.17.23) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 08 Nov 2007 08:55:58 +0000 Received: from Debian-exim by zigzag.lvk.cs.msu.su with spam-scanned (Exim 4.50) id 1Iq3Ay-0007Yd-5S for gdb-patches@sources.redhat.com; Thu, 08 Nov 2007 11:55:54 +0300 Received: from localhost ([127.0.0.1] helo=ip6-localhost) by zigzag.lvk.cs.msu.su with esmtp (Exim 4.50) id 1Iq3Ax-0007XS-GD for gdb-patches@sources.redhat.com; Thu, 08 Nov 2007 11:55:48 +0300 From: Vladimir Prus To: gdb-patches@sources.redhat.com Subject: Cleanup pending breakpoints floatsam Date: Thu, 08 Nov 2007 08:56:00 -0000 User-Agent: KMail/1.9.6 MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_T8sMHvITxt5rdL7" Message-Id: <200711081155.47340.ghost@cs.msu.su> 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: 2007-11/txt/msg00157.txt.bz2 --Boundary-00=_T8sMHvITxt5rdL7 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Content-length: 226 After pending breakpoints were changed for better, a number of functions have 'pending_bp' parameter that is not used in any way. This patch removes it. OK? (I'll write ChangeLog entry if this patch is approved) - Volodya --Boundary-00=_T8sMHvITxt5rdL7 Content-Type: text/x-diff; charset="utf-8"; name="pending_mi_1_cleanup.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pending_mi_1_cleanup.diff" Content-length: 5962 --- gdb/breakpoint.c (/mirrors/gdb) (revision 41) +++ gdb/breakpoint.c (/patches/pending_mi_1_cleanup) (revision 41) @@ -90,7 +90,7 @@ static void watch_command (char *, int); static int can_use_hardware_watchpoint (struct value *); -static int break_command_1 (char *, int, int, struct breakpoint *); +static int break_command_1 (char *, int, int); static void mention (struct breakpoint *); @@ -5065,17 +5065,13 @@ add_location_to_breakpoint (struct break /* Create a breakpoint with SAL as location. Use ADDR_STRING as textual description of the location, and COND_STRING - as condition expression. - - The paramter PENDING_BP is same as for the - create_breakpoints function. */ + as condition expression. */ static void create_breakpoint (struct symtabs_and_lines sals, char *addr_string, char *cond_string, enum bptype type, enum bpdisp disposition, - int thread, int ignore_count, int from_tty, - struct breakpoint *pending_bp) + int thread, int ignore_count, int from_tty) { struct breakpoint *b = NULL; int i; @@ -5124,12 +5120,7 @@ create_breakpoint (struct symtabs_and_li char *arg = b->cond_string; loc->cond = parse_exp_1 (&arg, block_for_pc (loc->address), 0); if (*arg) - { - if (pending_bp) - error (_("Junk at end of pending breakpoint condition expression")); - else - error (_("Garbage %s follows condition"), arg); - } + error (_("Garbage %s follows condition"), arg); } } @@ -5274,11 +5265,6 @@ expand_line_sal_maybe (struct symtab_and separate conditions for different overloaded functions, so we take just a single condition string. - The parameter PENDING_BP points to a pending breakpoint that is - the basis of the breakpoints currently being created. The pending - breakpoint may contain a separate condition string or commands - that were added after the initial pending breakpoint was created. - NOTE: If the function succeeds, the caller is expected to cleanup the arrays ADDR_STRING, COND_STRING, and SALS (but not the array contents). If the function fails (error() is called), the @@ -5289,8 +5275,7 @@ static void create_breakpoints (struct symtabs_and_lines sals, char **addr_string, char *cond_string, enum bptype type, enum bpdisp disposition, - int thread, int ignore_count, int from_tty, - struct breakpoint *pending_bp) + int thread, int ignore_count, int from_tty) { int i; for (i = 0; i < sals.nelts; ++i) @@ -5300,8 +5285,7 @@ create_breakpoints (struct symtabs_and_l create_breakpoint (expanded, addr_string[i], cond_string, type, disposition, - thread, ignore_count, from_tty, - pending_bp); + thread, ignore_count, from_tty); } } @@ -5453,13 +5437,10 @@ find_condition_and_thread (char *tok, CO /* Set a breakpoint according to ARG (function, linenum or *address) flag: first bit : 0 non-temporary, 1 temporary. - second bit : 0 normal breakpoint, 1 hardware breakpoint. - - PENDING_BP is non-NULL when this function is being called to resolve - a pending breakpoint. */ + second bit : 0 normal breakpoint, 1 hardware breakpoint. */ static int -break_command_1 (char *arg, int flag, int from_tty, struct breakpoint *pending_bp) +break_command_1 (char *arg, int flag, int from_tty) { struct gdb_exception e; int tempflag, hardwareflag; @@ -5504,10 +5485,6 @@ break_command_1 (char *arg, int flag, in switch (e.error) { case NOT_FOUND_ERROR: - /* If called to resolve pending breakpoint, just return - error code. */ - if (pending_bp) - return e.reason; exception_print (gdb_stderr, e); @@ -5591,8 +5568,7 @@ break_command_1 (char *arg, int flag, in hardwareflag ? bp_hardware_breakpoint : bp_breakpoint, tempflag ? disp_del : disp_donttouch, - thread, ignore_count, from_tty, - pending_bp); + thread, ignore_count, from_tty); } else { @@ -5714,8 +5690,7 @@ do_captured_breakpoint (struct ui_out *u create_breakpoints (sals, addr_string, args->condition, args->hardwareflag ? bp_hardware_breakpoint : bp_breakpoint, args->tempflag ? disp_del : disp_donttouch, - args->thread, args->ignore_count, 0/*from-tty*/, - NULL/*pending_bp*/); + args->thread, args->ignore_count, 0/*from-tty*/); /* That's it. Discard the cleanups for data inserted into the breakpoint. */ @@ -5798,25 +5773,25 @@ resolve_sal_pc (struct symtab_and_line * void break_command (char *arg, int from_tty) { - break_command_1 (arg, 0, from_tty, NULL); + break_command_1 (arg, 0, from_tty); } void tbreak_command (char *arg, int from_tty) { - break_command_1 (arg, BP_TEMPFLAG, from_tty, NULL); + break_command_1 (arg, BP_TEMPFLAG, from_tty); } static void hbreak_command (char *arg, int from_tty) { - break_command_1 (arg, BP_HARDWAREFLAG, from_tty, NULL); + break_command_1 (arg, BP_HARDWAREFLAG, from_tty); } static void thbreak_command (char *arg, int from_tty) { - break_command_1 (arg, (BP_TEMPFLAG | BP_HARDWAREFLAG), from_tty, NULL); + break_command_1 (arg, (BP_TEMPFLAG | BP_HARDWAREFLAG), from_tty); } static void @@ -5857,7 +5832,7 @@ stopin_command (char *arg, int from_tty) if (badInput) printf_filtered (_("Usage: stop in \n")); else - break_command_1 (arg, 0, from_tty, NULL); + break_command_1 (arg, 0, from_tty); } static void @@ -5889,7 +5864,7 @@ stopat_command (char *arg, int from_tty) if (badInput) printf_filtered (_("Usage: stop at \n")); else - break_command_1 (arg, 0, from_tty, NULL); + break_command_1 (arg, 0, from_tty); } /* accessflag: hw_write: watch write, Property changes on: ___________________________________________________________________ Name: svk:merge +e7755896-6108-0410-9592-8049d3e74e28:/mirrors/gdb/trunk:186691 --Boundary-00=_T8sMHvITxt5rdL7--