darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* breakpoint.c (breakpoint_address_is_meaningful): New function.

Browse source 
(check_duplicates): Don't compare non-meaningful addresses.
This commit is contained in:
Kevin Buettner 2001-05-23 00:52:44 +00:00
parent 5fd913cc66
commit e4f237da05
2 changed files with 44 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2001-05-22 Kevin Buettner <kevinb@redhat.com>
* breakpoint.c (breakpoint_address_is_meaningful): New function.
(check_duplicates): Don't compare non-meaningful addresses.
2001-05-22 Michael Snyder <msnyder@redhat.com> 2001-05-22 Michael Snyder <msnyder@redhat.com>
* thread-db.c: Allow for defunct zombie threads. * thread-db.c: Allow for defunct zombie threads.

46
gdb/breakpoint.c
View file

@ -3735,6 +3735,40 @@ set_default_breakpoint (int valid, CORE_ADDR addr, struct symtab *symtab,
default_breakpoint_line = line; default_breakpoint_line = line;
} }
/* Return true iff it is meaningful to use the address member of
BPT. For some breakpoint types, the address member is irrelevant
and it makes no sense to attempt to compare it to other addresses
(or use it for any other purpose either).
More specifically, each of the following breakpoint types will always
have a zero valued address and we don't want check_duplicates() to mark
breakpoints of any of these types to be a duplicate of an actual
breakpoint at address zero:
bp_watchpoint
bp_hardware_watchpoint
bp_read_watchpoint
bp_access_watchpoint
bp_catch_exec
bp_longjmp_resume
bp_catch_fork
bp_catch_vork */
static int
breakpoint_address_is_meaningful (struct breakpoint *bpt)
{
enum bptype type = bpt->type;
return (type != bp_watchpoint
&& type != bp_hardware_watchpoint
&& type != bp_read_watchpoint
&& type != bp_access_watchpoint
&& type != bp_catch_exec
&& type != bp_longjmp_resume
&& type != bp_catch_fork
&& type != bp_catch_vfork);
}
/* Rescan breakpoints at the same address and section as BPT, /* Rescan breakpoints at the same address and section as BPT,
marking the first one as "first" and any others as "duplicates". marking the first one as "first" and any others as "duplicates".
This is so that the bpt instruction is only inserted once. This is so that the bpt instruction is only inserted once.
@ -3750,11 +3784,7 @@ check_duplicates (struct breakpoint *bpt)
CORE_ADDR address = bpt->address; CORE_ADDR address = bpt->address;
asection *section = bpt->section; asection *section = bpt->section;
/* Watchpoints are uninteresting. */ if (! breakpoint_address_is_meaningful (bpt))
if (bpt->type == bp_watchpoint
|| bpt->type == bp_hardware_watchpoint
|| bpt->type == bp_read_watchpoint
|| bpt->type == bp_access_watchpoint)
return; return;
ALL_BREAKPOINTS (b) ALL_BREAKPOINTS (b)
@ -3762,7 +3792,8 @@ check_duplicates (struct breakpoint *bpt)
&& b->enable != shlib_disabled && b->enable != shlib_disabled
&& b->enable != call_disabled && b->enable != call_disabled
&& b->address == address && b->address == address
&& (overlay_debugging == 0 || b->section == section)) && (overlay_debugging == 0 || b->section == section)
&& breakpoint_address_is_meaningful (b))
{ {
/* Have we found a permanent breakpoint? */ /* Have we found a permanent breakpoint? */
if (b->enable == permanent) if (b->enable == permanent)
@ -3800,7 +3831,8 @@ check_duplicates (struct breakpoint *bpt)
&& b->enable != shlib_disabled && b->enable != shlib_disabled
&& b->enable != call_disabled && b->enable != call_disabled
&& b->address == address && b->address == address
&& (overlay_debugging == 0 || b->section == section)) && (overlay_debugging == 0 || b->section == section)
&& breakpoint_address_is_meaningful (b))
b->duplicate = 1; b->duplicate = 1;
} }
} }