From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12566 invoked by alias); 16 Aug 2002 15:37:37 -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 12555 invoked from network); 16 Aug 2002 15:37:36 -0000 Received: from unknown (HELO localhost.redhat.com) (216.138.202.10) by sources.redhat.com with SMTP; 16 Aug 2002 15:37:36 -0000 Received: from ges.redhat.com (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id B084E3C8D for ; Fri, 16 Aug 2002 11:37:34 -0400 (EDT) Message-ID: <3D5D1C3E.8070203@ges.redhat.com> Date: Fri, 16 Aug 2002 08:37:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-US; rv:1.0.0) Gecko/20020810 X-Accept-Language: en-us, en MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: [patch/ob] not_a_breakpoint -> not_a_sw_breakpoint Content-Type: multipart/mixed; boundary="------------000306090401080908090609" X-SW-Source: 2002-08/txt/msg00419.txt.bz2 This is a multi-part message in MIME format. --------------000306090401080908090609 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 229 Hello, This patch renames the ``not_a_breakpoint'' parameter of bpstat_stop_status() to the more correct ``not_a_sw_breakpoint'' so that it is clear that it is indicating nothing about hardware breakpoints. committed, Andrew --------------000306090401080908090609 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 2737 2002-08-16 Andrew Cagney * breakpoint.c (bpstat_stop_status): Rename not_a_breakpoint to not_a_sw_breakpoint. * breakpoint.h (bpstat_stop_status): Add parameter names. Index: breakpoint.c =================================================================== RCS file: /cvs/src/src/gdb/breakpoint.c,v retrieving revision 1.78 diff -u -r1.78 breakpoint.c --- breakpoint.c 26 Jun 2002 05:20:04 -0000 1.78 +++ breakpoint.c 16 Aug 2002 15:34:19 -0000 @@ -2390,7 +2390,7 @@ /* Get a bpstat associated with having just stopped at address *PC and frame address CORE_ADDRESS. Update *PC to point at the - breakpoint (if we hit a breakpoint). NOT_A_BREAKPOINT is nonzero + breakpoint (if we hit a breakpoint). NOT_A_SW_BREAKPOINT is nonzero if this is known to not be a real breakpoint (it could still be a watchpoint, though). */ @@ -2409,7 +2409,7 @@ commands, FIXME??? fields. */ bpstat -bpstat_stop_status (CORE_ADDR *pc, int not_a_breakpoint) +bpstat_stop_status (CORE_ADDR *pc, int not_a_sw_breakpoint) { register struct breakpoint *b, *temp; CORE_ADDR bp_addr; @@ -2423,13 +2423,13 @@ "Error evaluating expression for watchpoint %d\n"; char message[sizeof (message1) + 30 /* slop */ ]; - /* Get the address where the breakpoint would have been. - The "not_a_breakpoint" argument is meant to distinguish - between a breakpoint trap event and a trace/singlestep - trap event. For a trace/singlestep trap event, we would - not want to subtract DECR_PC_AFTER_BREAK from the PC. */ + /* Get the address where the breakpoint would have been. The + "not_a_sw_breakpoint" argument is meant to distinguish between a + breakpoint trap event and a trace/singlestep trap event. For a + trace/singlestep trap event, we would not want to subtract + DECR_PC_AFTER_BREAK from the PC. */ - bp_addr = *pc - (not_a_breakpoint && !SOFTWARE_SINGLE_STEP_P () ? + bp_addr = *pc - (not_a_sw_breakpoint && !SOFTWARE_SINGLE_STEP_P () ? 0 : DECR_PC_AFTER_BREAK); ALL_BREAKPOINTS_SAFE (b, temp) Index: breakpoint.h =================================================================== RCS file: /cvs/src/src/gdb/breakpoint.h,v retrieving revision 1.12 diff -u -r1.12 breakpoint.h --- breakpoint.h 10 Jun 2002 23:25:50 -0000 1.12 +++ breakpoint.h 16 Aug 2002 15:34:19 -0000 @@ -322,7 +322,7 @@ is part of the bpstat is copied as well. */ extern bpstat bpstat_copy (bpstat); -extern bpstat bpstat_stop_status (CORE_ADDR *, int); +extern bpstat bpstat_stop_status (CORE_ADDR *pc, int not_a_sw_breakpoint); /* This bpstat_what stuff tells wait_for_inferior what to do with a breakpoint (a challenging task). */ --------------000306090401080908090609--