From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30654 invoked by alias); 9 Mar 2007 04:48:27 -0000 Received: (qmail 30646 invoked by uid 22791); 9 Mar 2007 04:48:26 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate2.de.ibm.com (HELO mtagate2.de.ibm.com) (195.212.29.151) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 09 Mar 2007 04:48:20 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate2.de.ibm.com (8.13.8/8.13.8) with ESMTP id l294mFi3129412 for ; Fri, 9 Mar 2007 04:48:15 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v8.3) with ESMTP id l294mFfq2224248 for ; Fri, 9 Mar 2007 05:48:15 +0100 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id l294mEHf031879 for ; Fri, 9 Mar 2007 05:48:15 +0100 Received: from [9.152.248.44] (dyn-9-152-248-44.boeblingen.de.ibm.com [9.152.248.44]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id l294mEfS031876; Fri, 9 Mar 2007 05:48:14 +0100 Message-ID: <45F0E6C9.6050308@de.ibm.com> Date: Fri, 09 Mar 2007 04:48:00 -0000 From: Markus Deuling User-Agent: Thunderbird 1.5.0.9 (X11/20061215) MIME-Version: 1.0 To: Eli Zaretskii CC: gdb-patches@sourceware.org, brobecker@adacore.com, jimb@codesourcery.com, mark.kettenis@xs4all.nl, pedro_alves@portugalmail.pt, uweigand@de.ibm.com Subject: Re: [Patch]: Little Cleanup References: <200703062210.l26MAEmv032467@d12av02.megacenter.de.ibm.com> <45EE6B21.8060302@de.ibm.com> In-Reply-To: Content-Type: multipart/mixed; boundary="------------030204080104020408050709" 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-03/txt/msg00111.txt.bz2 This is a multi-part message in MIME format. --------------030204080104020408050709 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 389 Eli Zaretskii wrote: >> >> Ok? > > Fine with me, thanks. > Ok, this is the version with comments and tabs. ChangeLog: * infrun.c (breakpoints_failed): Remove unnecessary variable. (handle_inferior_event): Remove unnecessary braces. * breakpoint.c (bpstat_what): Remove wrong comme -- Markus Deuling GNU Toolchain for Linux on Cell BE deuling@de.ibm.com --------------030204080104020408050709 Content-Type: text/plain; name="cleanup_patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="cleanup_patch" Content-length: 1922 diff -urN src/gdb/breakpoint.c dev/gdb/breakpoint.c --- src/gdb/breakpoint.c 2007-02-27 20:46:04.000000000 +0100 +++ dev/gdb/breakpoint.c 2007-03-07 08:23:06.000000000 +0100 @@ -3134,8 +3134,6 @@ /* step_resume entries: a step resume breakpoint overrides another breakpoint of signal handling (see comment in wait_for_inferior at where we set the step_resume breakpoint). */ - /* We handle the through_sigtramp_breakpoint the same way; having both - one of those and a step_resume_breakpoint is probably very rare (?). */ static const enum bpstat_what_main_action table[(int) class_last][(int) BPSTAT_WHAT_LAST] = diff -urN src/gdb/infrun.c dev/gdb/infrun.c --- src/gdb/infrun.c 2007-03-01 06:45:40.000000000 +0100 +++ dev/gdb/infrun.c 2007-03-08 06:00:08.000000000 +0100 @@ -288,10 +288,6 @@ struct regcache *stop_registers; -/* Nonzero if program stopped due to error trying to insert breakpoints. */ - -static int breakpoints_failed; - /* Nonzero after stop if current stack frame should be printed. */ static int stop_print_frame; @@ -1830,7 +1826,6 @@ stop_print_frame = 1; ecs->random_signal = 0; stopped_by_random_signal = 0; - breakpoints_failed = 0; if (stop_signal == TARGET_SIGNAL_TRAP && trap_expected @@ -2126,9 +2121,7 @@ if (debug_infrun) fprintf_unfiltered (gdb_stdlog, "infrun: BPSTAT_WHAT_SINGLE\n"); if (breakpoints_inserted) - { - remove_breakpoints (); - } + remove_breakpoints (); breakpoints_inserted = 0; ecs->another_trap = 1; /* Still need to check other stuff, at least the case @@ -2909,8 +2902,9 @@ if (!breakpoints_inserted && !ecs->another_trap) { - breakpoints_failed = insert_breakpoints (); - if (breakpoints_failed) + /* Stop stepping when inserting breakpoints + has failed. */ + if (insert_breakpoints () != 0) { stop_stepping (ecs); return; --------------030204080104020408050709--