FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2001-02-28 Michael Snyder <msnyder@mvstp600e.cygnus.com>

Browse source 
* breakpoint.c (print_one_breakpoint): Formatting clean-up.
	(read_memory_nobpt): Ditto.
	(ep_is_catchpoint): Ditto.
	(ep_is_shlib_catchpoint): Ditto.
	(ep_is_exception_catchpoint): Ditto.
	(describe_other_breakpoints): Ditto.
This commit is contained in:
Michael Snyder 2001-03-01 03:50:17 +00:00
parent 97900206ca
commit d85310f71a
2 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gdb/ChangeLog
View file

@ -1,3 +1,12 @@
2001-02-28 Michael Snyder <msnyder@mvstp600e.cygnus.com>
* breakpoint.c (print_one_breakpoint): Formatting clean-up.
(read_memory_nobpt): Ditto.
(ep_is_catchpoint): Ditto.
(ep_is_shlib_catchpoint): Ditto.
(ep_is_exception_catchpoint): Ditto.
(describe_other_breakpoints): Ditto.
Wed Feb 28 20:37:36 2001 Andrew Cagney <ac131313@redhat.com> Wed Feb 28 20:37:36 2001 Andrew Cagney <ac131313@redhat.com>
* regcache.h (register_valid): Fix comment documenting valid * regcache.h (register_valid): Fix comment documenting valid

52
gdb/breakpoint.c
View file

@ -197,12 +197,12 @@ static char *ep_parse_optional_filename (char **arg);
static void catch_exec_command_1 (char *arg, int tempflag, int from_tty); static void catch_exec_command_1 (char *arg, int tempflag, int from_tty);
#endif #endif
static void create_exception_catchpoint static void create_exception_catchpoint (int tempflag, char *cond_string,
(int tempflag, char *cond_string, enum exception_event_kind ex_event,
enum exception_event_kind ex_event, struct symtab_and_line *sal); struct symtab_and_line *sal);
static void catch_exception_command_1 static void catch_exception_command_1 (enum exception_event_kind ex_event,
(enum exception_event_kind ex_event, char *arg, int tempflag, int from_tty); char *arg, int tempflag, int from_tty);
static void tcatch_command (char *arg, int from_tty); static void tcatch_command (char *arg, int from_tty);
@ -696,10 +696,9 @@ read_memory_nobpt (CORE_ADDR memaddr, char *myaddr, unsigned len)
if (bp_addr + bp_size < memaddr + len) if (bp_addr + bp_size < memaddr + len)
{ {
/* Copy the section of memory after the breakpoint. */ /* Copy the section of memory after the breakpoint. */
status = read_memory_nobpt status = read_memory_nobpt (bp_addr + bp_size,
(bp_addr + bp_size, myaddr + bp_addr + bp_size - memaddr,
myaddr + bp_addr + bp_size - memaddr, memaddr + len - (bp_addr + bp_size));
memaddr + len - (bp_addr + bp_size));
if (status != 0) if (status != 0)
return status; return status;
} }
@ -1613,11 +1612,9 @@ ep_is_catchpoint (struct breakpoint *ep)
|| (ep->type == bp_catch_vfork) || (ep->type == bp_catch_vfork)
|| (ep->type == bp_catch_exec) || (ep->type == bp_catch_exec)
|| (ep->type == bp_catch_catch) || (ep->type == bp_catch_catch)
|| (ep->type == bp_catch_throw) || (ep->type == bp_catch_throw);
/* ??rehrauer: Add more kinds here, as are implemented... */ /* ??rehrauer: Add more kinds here, as are implemented... */
;
} }
int int
@ -1625,8 +1622,7 @@ ep_is_shlib_catchpoint (struct breakpoint *ep)
{ {
return return
(ep->type == bp_catch_load) (ep->type == bp_catch_load)
|| (ep->type == bp_catch_unload) || (ep->type == bp_catch_unload);
;
} }
int int
@ -1634,8 +1630,7 @@ ep_is_exception_catchpoint (struct breakpoint *ep)
{ {
return return
(ep->type == bp_catch_catch) (ep->type == bp_catch_catch)
|| (ep->type == bp_catch_throw) || (ep->type == bp_catch_throw);
;
} }
/* Clear a bpstat so that it says we are not at any breakpoint. /* Clear a bpstat so that it says we are not at any breakpoint.
@ -3338,10 +3333,9 @@ print_one_breakpoint (struct breakpoint *b,
annotate_field (4); annotate_field (4);
/* FIXME-32x64: need a print_address_numeric with /* FIXME-32x64: need a print_address_numeric with
field width */ field width */
printf_filtered printf_filtered ("%s ",
("%s ", local_hex_string_custom
local_hex_string_custom ((unsigned long) b->address, "08l"));
((unsigned long) b->address, "08l"));
} }
annotate_field (5); annotate_field (5);
*last_addr = b->address; *last_addr = b->address;
@ -3681,15 +3675,15 @@ describe_other_breakpoints (CORE_ADDR pc, asection *section)
b->section == section) b->section == section)
{ {
others--; others--;
printf_filtered printf_filtered ("%d%s%s ",
("%d%s%s ", b->number,
b->number, ((b->enable == disabled ||
((b->enable == disabled || b->enable == shlib_disabled ||
b->enable == shlib_disabled || b->enable == call_disabled) ? " (disabled)"
b->enable == call_disabled) ? " (disabled)" : b->enable == permanent ? " (permanent)"
: b->enable == permanent ? " (permanent)" : ""),
: ""), (others > 1) ? ","
(others > 1) ? "," : ((others == 1) ? " and" : "")); : ((others == 1) ? " and" : ""));
} }
printf_filtered ("also set at pc "); printf_filtered ("also set at pc ");
print_address_numeric (pc, 1, gdb_stdout); print_address_numeric (pc, 1, gdb_stdout);