From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26782 invoked by alias); 23 Aug 2002 16:27:31 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 26775 invoked from network); 23 Aug 2002 16:27:30 -0000 Received: from unknown (HELO takamaka.act-europe.fr) (205.232.38.247) by sources.redhat.com with SMTP; 23 Aug 2002 16:27:30 -0000 Received: by takamaka.act-europe.fr (Postfix, from userid 507) id 5578FD2CBD; Fri, 23 Aug 2002 09:27:29 -0700 (PDT) Date: Fri, 23 Aug 2002 10:29:00 -0000 From: Joel Brobecker To: Michael Snyder Cc: gdb-patches@sources.redhat.com Subject: Re: [PATCH] Minor reformatting in infrun.c Message-ID: <20020823162729.GZ25997@gnat.com> References: <20020817001848.GX906@gnat.com> <3D5DB58E.3A856EB3@redhat.com> <20020822234116.GU25997@gnat.com> <3D657A41.EBE52A4B@redhat.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="96YOpH+ONegL0A3E" Content-Disposition: inline In-Reply-To: <3D657A41.EBE52A4B@redhat.com> User-Agent: Mutt/1.4i X-SW-Source: 2002-08/txt/msg00755.txt.bz2 --96YOpH+ONegL0A3E Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 851 > Err, I was actually meaning to say "let's conform with indent", > rather than "let's defeat indent". How about moving the comment > outside the argument list? Then the args can stay as they were. I see what you mean now. I should have tried it before, instead of assuming that moving the comment up would not prevent indent from formatting the args back to the same previous unreadable way (I did not realize that the comment had this effect in the formatting result)... I can commit the following patch. I verified that a later re-indent does not cause a formatting change in the second argument. 2002-08-23 Joel Brobecker * infrun.c (handle_inferior_event): Move a comment outside of a function call, in order to avoid indent reformatting this part of the code in an unreadable way. -- Joel --96YOpH+ONegL0A3E Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="infrun.c.diff" Content-length: 2392 Index: infrun.c =================================================================== RCS file: /cvs/src/src/gdb/infrun.c,v retrieving revision 1.68 diff -c -3 -p -r1.68 infrun.c *** infrun.c 20 Aug 2002 23:01:29 -0000 1.68 --- infrun.c 23 Aug 2002 16:17:49 -0000 *************** handle_inferior_event (struct execution_ *** 2110,2127 **** This is only important on targets where DECR_PC_AFTER_BREAK is non-zero. The prev_pc test is meant to distinguish between singlestepping a trap instruction, and singlestepping thru a ! jump to the instruction following a trap instruction. */ stop_bpstat = bpstat_stop_status (&stop_pc, - /* Pass TRUE if our reason for stopping is something other - than hitting a breakpoint. We do this by checking that - either we detected earlier a software single step trap or - 1) stepping is going on and 2) we didn't hit a breakpoint - in a signal handler without an intervening stop in - sigtramp, which is detected by a new stack pointer value - below any usual function calling stack adjustments. */ sw_single_step_trap_p || (currently_stepping (ecs) && prev_pc != stop_pc - DECR_PC_AFTER_BREAK --- 2110,2127 ---- This is only important on targets where DECR_PC_AFTER_BREAK is non-zero. The prev_pc test is meant to distinguish between singlestepping a trap instruction, and singlestepping thru a ! jump to the instruction following a trap instruction. + Therefore, pass TRUE if our reason for stopping is + something other than hitting a breakpoint. We do this by + checking that either: we detected earlier a software single + step trap or, 1) stepping is going on and 2) we didn't hit + a breakpoint in a signal handler without an intervening stop + in sigtramp, which is detected by a new stack pointer value + below any usual function calling stack adjustments. */ stop_bpstat = bpstat_stop_status (&stop_pc, sw_single_step_trap_p || (currently_stepping (ecs) && prev_pc != stop_pc - DECR_PC_AFTER_BREAK --96YOpH+ONegL0A3E--