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). */