* breakpoint.h (struct breakpoint_ops): New.
(struct breakpoint): Add ops member. * breakpoint.c (print_bp_stop_message, print_one_breakpoint) (mention): Use new breakpoint ops member. (set_raw_breakpoint): Initialize ops field to NULL. (print_exception_catchpoint, print_one_exception_catchpoint) (print_mention_exception_catchpoint, handle_gnu_v3_exceptions): New. (gnu_v3_exception_catchpoint_ops): New. (catch_exception_command_1): Call handle_gnu_v3_exceptions.
This commit is contained in:
Daniel Jacobowitz
parent
44c0647d80
commit
3086aeaed2
3 changed files with 368 additions and 232 deletions
|
|
@ -1,3 +1,16 @@
|
||||||
|
2003-04-26 Daniel Jacobowitz <drow@mvista.com>
|
||||||
|
|
||||||
|
* breakpoint.h (struct breakpoint_ops): New.
|
||||||
|
(struct breakpoint): Add ops member.
|
||||||
|
|
||||||
|
* breakpoint.c (print_bp_stop_message, print_one_breakpoint)
|
||||||
|
(mention): Use new breakpoint ops member.
|
||||||
|
(set_raw_breakpoint): Initialize ops field to NULL.
|
||||||
|
(print_exception_catchpoint, print_one_exception_catchpoint)
|
||||||
|
(print_mention_exception_catchpoint, handle_gnu_v3_exceptions): New.
|
||||||
|
(gnu_v3_exception_catchpoint_ops): New.
|
||||||
|
(catch_exception_command_1): Call handle_gnu_v3_exceptions.
|
||||||
|
|
||||||
2003-04-25 Adam Fedor <fedor@gnu.org>
|
2003-04-25 Adam Fedor <fedor@gnu.org>
|
||||||
|
|
||||||
* Makefile.in (COMMON_OBS): Add objc-lang.o
|
* Makefile.in (COMMON_OBS): Add objc-lang.o
|
||||||
|
|
|
||||||
566
gdb/breakpoint.c
566
gdb/breakpoint.c
|
|
@ -2271,9 +2271,15 @@ print_bp_stop_message (bpstat bs)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case print_it_normal:
|
case print_it_normal:
|
||||||
/* Normal case, we handle everything in print_it_typical. */
|
/* Normal case. Call the breakpoint's print_it method, or
|
||||||
return print_it_typical (bs);
|
print_it_typical. */
|
||||||
|
if (bs->breakpoint_at != NULL && bs->breakpoint_at->ops != NULL
|
||||||
|
&& bs->breakpoint_at->ops->print_it != NULL)
|
||||||
|
return bs->breakpoint_at->ops->print_it (bs->breakpoint_at);
|
||||||
|
else
|
||||||
|
return print_it_typical (bs);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
internal_error (__FILE__, __LINE__,
|
internal_error (__FILE__, __LINE__,
|
||||||
"print_bp_stop_message: unrecognized enum value");
|
"print_bp_stop_message: unrecognized enum value");
|
||||||
|
|
@ -3265,143 +3271,147 @@ print_one_breakpoint (struct breakpoint *b,
|
||||||
else
|
else
|
||||||
strcat (wrap_indent, " ");
|
strcat (wrap_indent, " ");
|
||||||
}
|
}
|
||||||
switch (b->type)
|
|
||||||
{
|
|
||||||
case bp_none:
|
|
||||||
internal_error (__FILE__, __LINE__,
|
|
||||||
"print_one_breakpoint: bp_none encountered\n");
|
|
||||||
break;
|
|
||||||
|
|
||||||
case bp_watchpoint:
|
if (b->ops != NULL && b->ops->print_one != NULL)
|
||||||
case bp_hardware_watchpoint:
|
b->ops->print_one (b, last_addr);
|
||||||
case bp_read_watchpoint:
|
else
|
||||||
case bp_access_watchpoint:
|
switch (b->type)
|
||||||
/* Field 4, the address, is omitted (which makes the columns
|
{
|
||||||
not line up too nicely with the headers, but the effect
|
case bp_none:
|
||||||
is relatively readable). */
|
internal_error (__FILE__, __LINE__,
|
||||||
if (addressprint)
|
"print_one_breakpoint: bp_none encountered\n");
|
||||||
ui_out_field_skip (uiout, "addr");
|
break;
|
||||||
annotate_field (5);
|
|
||||||
print_expression (b->exp, stb->stream);
|
|
||||||
ui_out_field_stream (uiout, "what", stb);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case bp_catch_load:
|
|
||||||
case bp_catch_unload:
|
|
||||||
/* Field 4, the address, is omitted (which makes the columns
|
|
||||||
not line up too nicely with the headers, but the effect
|
|
||||||
is relatively readable). */
|
|
||||||
if (addressprint)
|
|
||||||
ui_out_field_skip (uiout, "addr");
|
|
||||||
annotate_field (5);
|
|
||||||
if (b->dll_pathname == NULL)
|
|
||||||
{
|
|
||||||
ui_out_field_string (uiout, "what", "<any library>");
|
|
||||||
ui_out_spaces (uiout, 1);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ui_out_text (uiout, "library \"");
|
|
||||||
ui_out_field_string (uiout, "what", b->dll_pathname);
|
|
||||||
ui_out_text (uiout, "\" ");
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case bp_catch_fork:
|
|
||||||
case bp_catch_vfork:
|
|
||||||
/* Field 4, the address, is omitted (which makes the columns
|
|
||||||
not line up too nicely with the headers, but the effect
|
|
||||||
is relatively readable). */
|
|
||||||
if (addressprint)
|
|
||||||
ui_out_field_skip (uiout, "addr");
|
|
||||||
annotate_field (5);
|
|
||||||
if (b->forked_inferior_pid != 0)
|
|
||||||
{
|
|
||||||
ui_out_text (uiout, "process ");
|
|
||||||
ui_out_field_int (uiout, "what", b->forked_inferior_pid);
|
|
||||||
ui_out_spaces (uiout, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
case bp_catch_exec:
|
|
||||||
/* Field 4, the address, is omitted (which makes the columns
|
|
||||||
not line up too nicely with the headers, but the effect
|
|
||||||
is relatively readable). */
|
|
||||||
if (addressprint)
|
|
||||||
ui_out_field_skip (uiout, "addr");
|
|
||||||
annotate_field (5);
|
|
||||||
if (b->exec_pathname != NULL)
|
|
||||||
{
|
|
||||||
ui_out_text (uiout, "program \"");
|
|
||||||
ui_out_field_string (uiout, "what", b->exec_pathname);
|
|
||||||
ui_out_text (uiout, "\" ");
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case bp_catch_catch:
|
case bp_watchpoint:
|
||||||
/* Field 4, the address, is omitted (which makes the columns
|
case bp_hardware_watchpoint:
|
||||||
not line up too nicely with the headers, but the effect
|
case bp_read_watchpoint:
|
||||||
is relatively readable). */
|
case bp_access_watchpoint:
|
||||||
if (addressprint)
|
/* Field 4, the address, is omitted (which makes the columns
|
||||||
ui_out_field_skip (uiout, "addr");
|
not line up too nicely with the headers, but the effect
|
||||||
annotate_field (5);
|
is relatively readable). */
|
||||||
ui_out_field_string (uiout, "what", "exception catch");
|
if (addressprint)
|
||||||
ui_out_spaces (uiout, 1);
|
ui_out_field_skip (uiout, "addr");
|
||||||
break;
|
annotate_field (5);
|
||||||
|
print_expression (b->exp, stb->stream);
|
||||||
|
ui_out_field_stream (uiout, "what", stb);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case bp_catch_load:
|
||||||
|
case bp_catch_unload:
|
||||||
|
/* Field 4, the address, is omitted (which makes the columns
|
||||||
|
not line up too nicely with the headers, but the effect
|
||||||
|
is relatively readable). */
|
||||||
|
if (addressprint)
|
||||||
|
ui_out_field_skip (uiout, "addr");
|
||||||
|
annotate_field (5);
|
||||||
|
if (b->dll_pathname == NULL)
|
||||||
|
{
|
||||||
|
ui_out_field_string (uiout, "what", "<any library>");
|
||||||
|
ui_out_spaces (uiout, 1);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ui_out_text (uiout, "library \"");
|
||||||
|
ui_out_field_string (uiout, "what", b->dll_pathname);
|
||||||
|
ui_out_text (uiout, "\" ");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case bp_catch_fork:
|
||||||
|
case bp_catch_vfork:
|
||||||
|
/* Field 4, the address, is omitted (which makes the columns
|
||||||
|
not line up too nicely with the headers, but the effect
|
||||||
|
is relatively readable). */
|
||||||
|
if (addressprint)
|
||||||
|
ui_out_field_skip (uiout, "addr");
|
||||||
|
annotate_field (5);
|
||||||
|
if (b->forked_inferior_pid != 0)
|
||||||
|
{
|
||||||
|
ui_out_text (uiout, "process ");
|
||||||
|
ui_out_field_int (uiout, "what", b->forked_inferior_pid);
|
||||||
|
ui_out_spaces (uiout, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
case bp_catch_exec:
|
||||||
|
/* Field 4, the address, is omitted (which makes the columns
|
||||||
|
not line up too nicely with the headers, but the effect
|
||||||
|
is relatively readable). */
|
||||||
|
if (addressprint)
|
||||||
|
ui_out_field_skip (uiout, "addr");
|
||||||
|
annotate_field (5);
|
||||||
|
if (b->exec_pathname != NULL)
|
||||||
|
{
|
||||||
|
ui_out_text (uiout, "program \"");
|
||||||
|
ui_out_field_string (uiout, "what", b->exec_pathname);
|
||||||
|
ui_out_text (uiout, "\" ");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case bp_catch_catch:
|
||||||
|
/* Field 4, the address, is omitted (which makes the columns
|
||||||
|
not line up too nicely with the headers, but the effect
|
||||||
|
is relatively readable). */
|
||||||
|
if (addressprint)
|
||||||
|
ui_out_field_skip (uiout, "addr");
|
||||||
|
annotate_field (5);
|
||||||
|
ui_out_field_string (uiout, "what", "exception catch");
|
||||||
|
ui_out_spaces (uiout, 1);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case bp_catch_throw:
|
||||||
|
/* Field 4, the address, is omitted (which makes the columns
|
||||||
|
not line up too nicely with the headers, but the effect
|
||||||
|
is relatively readable). */
|
||||||
|
if (addressprint)
|
||||||
|
ui_out_field_skip (uiout, "addr");
|
||||||
|
annotate_field (5);
|
||||||
|
ui_out_field_string (uiout, "what", "exception throw");
|
||||||
|
ui_out_spaces (uiout, 1);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case bp_breakpoint:
|
||||||
|
case bp_hardware_breakpoint:
|
||||||
|
case bp_until:
|
||||||
|
case bp_finish:
|
||||||
|
case bp_longjmp:
|
||||||
|
case bp_longjmp_resume:
|
||||||
|
case bp_step_resume:
|
||||||
|
case bp_through_sigtramp:
|
||||||
|
case bp_watchpoint_scope:
|
||||||
|
case bp_call_dummy:
|
||||||
|
case bp_shlib_event:
|
||||||
|
case bp_thread_event:
|
||||||
|
case bp_overlay_event:
|
||||||
|
if (addressprint)
|
||||||
|
{
|
||||||
|
annotate_field (4);
|
||||||
|
ui_out_field_core_addr (uiout, "addr", b->address);
|
||||||
|
}
|
||||||
|
annotate_field (5);
|
||||||
|
*last_addr = b->address;
|
||||||
|
if (b->source_file)
|
||||||
|
{
|
||||||
|
sym = find_pc_sect_function (b->address, b->section);
|
||||||
|
if (sym)
|
||||||
|
{
|
||||||
|
ui_out_text (uiout, "in ");
|
||||||
|
ui_out_field_string (uiout, "func",
|
||||||
|
SYMBOL_PRINT_NAME (sym));
|
||||||
|
ui_out_wrap_hint (uiout, wrap_indent);
|
||||||
|
ui_out_text (uiout, " at ");
|
||||||
|
}
|
||||||
|
ui_out_field_string (uiout, "file", b->source_file);
|
||||||
|
ui_out_text (uiout, ":");
|
||||||
|
ui_out_field_int (uiout, "line", b->line_number);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print_address_symbolic (b->address, stb->stream, demangle, "");
|
||||||
|
ui_out_field_stream (uiout, "at", stb);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case bp_catch_throw:
|
|
||||||
/* Field 4, the address, is omitted (which makes the columns
|
|
||||||
not line up too nicely with the headers, but the effect
|
|
||||||
is relatively readable). */
|
|
||||||
if (addressprint)
|
|
||||||
ui_out_field_skip (uiout, "addr");
|
|
||||||
annotate_field (5);
|
|
||||||
ui_out_field_string (uiout, "what", "exception throw");
|
|
||||||
ui_out_spaces (uiout, 1);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case bp_breakpoint:
|
|
||||||
case bp_hardware_breakpoint:
|
|
||||||
case bp_until:
|
|
||||||
case bp_finish:
|
|
||||||
case bp_longjmp:
|
|
||||||
case bp_longjmp_resume:
|
|
||||||
case bp_step_resume:
|
|
||||||
case bp_through_sigtramp:
|
|
||||||
case bp_watchpoint_scope:
|
|
||||||
case bp_call_dummy:
|
|
||||||
case bp_shlib_event:
|
|
||||||
case bp_thread_event:
|
|
||||||
case bp_overlay_event:
|
|
||||||
if (addressprint)
|
|
||||||
{
|
|
||||||
annotate_field (4);
|
|
||||||
ui_out_field_core_addr (uiout, "addr", b->address);
|
|
||||||
}
|
|
||||||
annotate_field (5);
|
|
||||||
*last_addr = b->address;
|
|
||||||
if (b->source_file)
|
|
||||||
{
|
|
||||||
sym = find_pc_sect_function (b->address, b->section);
|
|
||||||
if (sym)
|
|
||||||
{
|
|
||||||
ui_out_text (uiout, "in ");
|
|
||||||
ui_out_field_string (uiout, "func",
|
|
||||||
SYMBOL_PRINT_NAME (sym));
|
|
||||||
ui_out_wrap_hint (uiout, wrap_indent);
|
|
||||||
ui_out_text (uiout, " at ");
|
|
||||||
}
|
|
||||||
ui_out_field_string (uiout, "file", b->source_file);
|
|
||||||
ui_out_text (uiout, ":");
|
|
||||||
ui_out_field_int (uiout, "line", b->line_number);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
print_address_symbolic (b->address, stb->stream, demangle, "");
|
|
||||||
ui_out_field_stream (uiout, "at", stb);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (b->thread != -1)
|
if (b->thread != -1)
|
||||||
{
|
{
|
||||||
/* FIXME: This seems to be redundant and lost here; see the
|
/* FIXME: This seems to be redundant and lost here; see the
|
||||||
|
|
@ -3851,6 +3861,7 @@ set_raw_breakpoint (struct symtab_and_line sal, enum bptype bptype)
|
||||||
b->triggered_dll_pathname = NULL;
|
b->triggered_dll_pathname = NULL;
|
||||||
b->forked_inferior_pid = 0;
|
b->forked_inferior_pid = 0;
|
||||||
b->exec_pathname = NULL;
|
b->exec_pathname = NULL;
|
||||||
|
b->ops = NULL;
|
||||||
|
|
||||||
/* Add this breakpoint to the end of the chain
|
/* Add this breakpoint to the end of the chain
|
||||||
so that a list of breakpoints will come out in order
|
so that a list of breakpoints will come out in order
|
||||||
|
|
@ -4413,103 +4424,107 @@ mention (struct breakpoint *b)
|
||||||
create_breakpoint_hook (b);
|
create_breakpoint_hook (b);
|
||||||
breakpoint_create_event (b->number);
|
breakpoint_create_event (b->number);
|
||||||
|
|
||||||
switch (b->type)
|
if (b->ops != NULL && b->ops->print_mention != NULL)
|
||||||
{
|
b->ops->print_mention (b);
|
||||||
case bp_none:
|
else
|
||||||
printf_filtered ("(apparently deleted?) Eventpoint %d: ", b->number);
|
switch (b->type)
|
||||||
break;
|
{
|
||||||
case bp_watchpoint:
|
case bp_none:
|
||||||
ui_out_text (uiout, "Watchpoint ");
|
printf_filtered ("(apparently deleted?) Eventpoint %d: ", b->number);
|
||||||
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "wpt");
|
break;
|
||||||
ui_out_field_int (uiout, "number", b->number);
|
case bp_watchpoint:
|
||||||
ui_out_text (uiout, ": ");
|
ui_out_text (uiout, "Watchpoint ");
|
||||||
print_expression (b->exp, stb->stream);
|
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "wpt");
|
||||||
ui_out_field_stream (uiout, "exp", stb);
|
ui_out_field_int (uiout, "number", b->number);
|
||||||
do_cleanups (ui_out_chain);
|
ui_out_text (uiout, ": ");
|
||||||
break;
|
print_expression (b->exp, stb->stream);
|
||||||
case bp_hardware_watchpoint:
|
ui_out_field_stream (uiout, "exp", stb);
|
||||||
ui_out_text (uiout, "Hardware watchpoint ");
|
do_cleanups (ui_out_chain);
|
||||||
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "wpt");
|
break;
|
||||||
ui_out_field_int (uiout, "number", b->number);
|
case bp_hardware_watchpoint:
|
||||||
ui_out_text (uiout, ": ");
|
ui_out_text (uiout, "Hardware watchpoint ");
|
||||||
print_expression (b->exp, stb->stream);
|
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "wpt");
|
||||||
ui_out_field_stream (uiout, "exp", stb);
|
ui_out_field_int (uiout, "number", b->number);
|
||||||
do_cleanups (ui_out_chain);
|
ui_out_text (uiout, ": ");
|
||||||
break;
|
print_expression (b->exp, stb->stream);
|
||||||
case bp_read_watchpoint:
|
ui_out_field_stream (uiout, "exp", stb);
|
||||||
ui_out_text (uiout, "Hardware read watchpoint ");
|
do_cleanups (ui_out_chain);
|
||||||
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "hw-rwpt");
|
break;
|
||||||
ui_out_field_int (uiout, "number", b->number);
|
case bp_read_watchpoint:
|
||||||
ui_out_text (uiout, ": ");
|
ui_out_text (uiout, "Hardware read watchpoint ");
|
||||||
print_expression (b->exp, stb->stream);
|
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "hw-rwpt");
|
||||||
ui_out_field_stream (uiout, "exp", stb);
|
ui_out_field_int (uiout, "number", b->number);
|
||||||
do_cleanups (ui_out_chain);
|
ui_out_text (uiout, ": ");
|
||||||
break;
|
print_expression (b->exp, stb->stream);
|
||||||
case bp_access_watchpoint:
|
ui_out_field_stream (uiout, "exp", stb);
|
||||||
ui_out_text (uiout, "Hardware access (read/write) watchpoint ");
|
do_cleanups (ui_out_chain);
|
||||||
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "hw-awpt");
|
break;
|
||||||
ui_out_field_int (uiout, "number", b->number);
|
case bp_access_watchpoint:
|
||||||
ui_out_text (uiout, ": ");
|
ui_out_text (uiout, "Hardware access (read/write) watchpoint ");
|
||||||
print_expression (b->exp, stb->stream);
|
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "hw-awpt");
|
||||||
ui_out_field_stream (uiout, "exp", stb);
|
ui_out_field_int (uiout, "number", b->number);
|
||||||
do_cleanups (ui_out_chain);
|
ui_out_text (uiout, ": ");
|
||||||
break;
|
print_expression (b->exp, stb->stream);
|
||||||
case bp_breakpoint:
|
ui_out_field_stream (uiout, "exp", stb);
|
||||||
if (ui_out_is_mi_like_p (uiout))
|
do_cleanups (ui_out_chain);
|
||||||
{
|
break;
|
||||||
say_where = 0;
|
case bp_breakpoint:
|
||||||
break;
|
if (ui_out_is_mi_like_p (uiout))
|
||||||
}
|
{
|
||||||
printf_filtered ("Breakpoint %d", b->number);
|
say_where = 0;
|
||||||
say_where = 1;
|
break;
|
||||||
break;
|
}
|
||||||
case bp_hardware_breakpoint:
|
printf_filtered ("Breakpoint %d", b->number);
|
||||||
if (ui_out_is_mi_like_p (uiout))
|
say_where = 1;
|
||||||
{
|
break;
|
||||||
say_where = 0;
|
case bp_hardware_breakpoint:
|
||||||
break;
|
if (ui_out_is_mi_like_p (uiout))
|
||||||
}
|
{
|
||||||
printf_filtered ("Hardware assisted breakpoint %d", b->number);
|
say_where = 0;
|
||||||
say_where = 1;
|
break;
|
||||||
break;
|
}
|
||||||
case bp_catch_load:
|
printf_filtered ("Hardware assisted breakpoint %d", b->number);
|
||||||
case bp_catch_unload:
|
say_where = 1;
|
||||||
printf_filtered ("Catchpoint %d (%s %s)",
|
break;
|
||||||
b->number,
|
case bp_catch_load:
|
||||||
(b->type == bp_catch_load) ? "load" : "unload",
|
case bp_catch_unload:
|
||||||
(b->dll_pathname != NULL) ?
|
printf_filtered ("Catchpoint %d (%s %s)",
|
||||||
b->dll_pathname : "<any library>");
|
b->number,
|
||||||
break;
|
(b->type == bp_catch_load) ? "load" : "unload",
|
||||||
case bp_catch_fork:
|
(b->dll_pathname != NULL) ?
|
||||||
case bp_catch_vfork:
|
b->dll_pathname : "<any library>");
|
||||||
printf_filtered ("Catchpoint %d (%s)",
|
break;
|
||||||
b->number,
|
case bp_catch_fork:
|
||||||
(b->type == bp_catch_fork) ? "fork" : "vfork");
|
case bp_catch_vfork:
|
||||||
break;
|
printf_filtered ("Catchpoint %d (%s)",
|
||||||
case bp_catch_exec:
|
b->number,
|
||||||
printf_filtered ("Catchpoint %d (exec)",
|
(b->type == bp_catch_fork) ? "fork" : "vfork");
|
||||||
b->number);
|
break;
|
||||||
break;
|
case bp_catch_exec:
|
||||||
case bp_catch_catch:
|
printf_filtered ("Catchpoint %d (exec)",
|
||||||
case bp_catch_throw:
|
b->number);
|
||||||
printf_filtered ("Catchpoint %d (%s)",
|
break;
|
||||||
b->number,
|
case bp_catch_catch:
|
||||||
(b->type == bp_catch_catch) ? "catch" : "throw");
|
case bp_catch_throw:
|
||||||
break;
|
printf_filtered ("Catchpoint %d (%s)",
|
||||||
|
b->number,
|
||||||
|
(b->type == bp_catch_catch) ? "catch" : "throw");
|
||||||
|
break;
|
||||||
|
|
||||||
|
case bp_until:
|
||||||
|
case bp_finish:
|
||||||
|
case bp_longjmp:
|
||||||
|
case bp_longjmp_resume:
|
||||||
|
case bp_step_resume:
|
||||||
|
case bp_through_sigtramp:
|
||||||
|
case bp_call_dummy:
|
||||||
|
case bp_watchpoint_scope:
|
||||||
|
case bp_shlib_event:
|
||||||
|
case bp_thread_event:
|
||||||
|
case bp_overlay_event:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case bp_until:
|
|
||||||
case bp_finish:
|
|
||||||
case bp_longjmp:
|
|
||||||
case bp_longjmp_resume:
|
|
||||||
case bp_step_resume:
|
|
||||||
case bp_through_sigtramp:
|
|
||||||
case bp_call_dummy:
|
|
||||||
case bp_watchpoint_scope:
|
|
||||||
case bp_shlib_event:
|
|
||||||
case bp_thread_event:
|
|
||||||
case bp_overlay_event:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (say_where)
|
if (say_where)
|
||||||
{
|
{
|
||||||
if (addressprint || b->source_file == NULL)
|
if (addressprint || b->source_file == NULL)
|
||||||
|
|
@ -6004,6 +6019,90 @@ create_exception_catchpoint (int tempflag, char *cond_string,
|
||||||
mention (b);
|
mention (b);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static enum print_stop_action
|
||||||
|
print_exception_catchpoint (struct breakpoint *b)
|
||||||
|
{
|
||||||
|
annotate_catchpoint (b->number);
|
||||||
|
|
||||||
|
if (strstr (b->addr_string, "throw") != NULL)
|
||||||
|
printf_filtered ("\nCatchpoint %d (exception thrown)\n",
|
||||||
|
b->number);
|
||||||
|
else
|
||||||
|
printf_filtered ("\nCatchpoint %d (exception caught)\n",
|
||||||
|
b->number);
|
||||||
|
|
||||||
|
return PRINT_SRC_AND_LOC;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
print_one_exception_catchpoint (struct breakpoint *b, CORE_ADDR *last_addr)
|
||||||
|
{
|
||||||
|
if (addressprint)
|
||||||
|
{
|
||||||
|
annotate_field (4);
|
||||||
|
ui_out_field_core_addr (uiout, "addr", b->address);
|
||||||
|
}
|
||||||
|
annotate_field (5);
|
||||||
|
*last_addr = b->address;
|
||||||
|
if (strstr (b->addr_string, "throw") != NULL)
|
||||||
|
ui_out_field_string (uiout, "what", "exception throw");
|
||||||
|
else
|
||||||
|
ui_out_field_string (uiout, "what", "exception catch");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
print_mention_exception_catchpoint (struct breakpoint *b)
|
||||||
|
{
|
||||||
|
if (strstr (b->addr_string, "throw") != NULL)
|
||||||
|
printf_filtered ("Catchpoint %d (throw)", b->number);
|
||||||
|
else
|
||||||
|
printf_filtered ("Catchpoint %d (catch)", b->number);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct breakpoint_ops gnu_v3_exception_catchpoint_ops = {
|
||||||
|
print_exception_catchpoint,
|
||||||
|
print_one_exception_catchpoint,
|
||||||
|
print_mention_exception_catchpoint
|
||||||
|
};
|
||||||
|
|
||||||
|
static int
|
||||||
|
handle_gnu_v3_exceptions (int tempflag, char *cond_string,
|
||||||
|
enum exception_event_kind ex_event, int from_tty)
|
||||||
|
{
|
||||||
|
char *trigger_func_name, *nameptr;
|
||||||
|
struct symtabs_and_lines sals;
|
||||||
|
struct breakpoint *b;
|
||||||
|
|
||||||
|
if (ex_event == EX_EVENT_CATCH)
|
||||||
|
trigger_func_name = xstrdup ("__cxa_begin_catch");
|
||||||
|
else
|
||||||
|
trigger_func_name = xstrdup ("__cxa_throw");
|
||||||
|
|
||||||
|
nameptr = trigger_func_name;
|
||||||
|
sals = decode_line_1 (&nameptr, 1, NULL, 0, NULL);
|
||||||
|
if (sals.nelts == 0)
|
||||||
|
{
|
||||||
|
free (trigger_func_name);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
b = set_raw_breakpoint (sals.sals[0], bp_breakpoint);
|
||||||
|
set_breakpoint_count (breakpoint_count + 1);
|
||||||
|
b->number = breakpoint_count;
|
||||||
|
b->cond = NULL;
|
||||||
|
b->cond_string = (cond_string == NULL) ?
|
||||||
|
NULL : savestring (cond_string, strlen (cond_string));
|
||||||
|
b->thread = -1;
|
||||||
|
b->addr_string = trigger_func_name;
|
||||||
|
b->enable_state = bp_enabled;
|
||||||
|
b->disposition = tempflag ? disp_del : disp_donttouch;
|
||||||
|
b->ops = &gnu_v3_exception_catchpoint_ops;
|
||||||
|
|
||||||
|
free (sals.sals);
|
||||||
|
mention (b);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
/* Deal with "catch catch" and "catch throw" commands */
|
/* Deal with "catch catch" and "catch throw" commands */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
@ -6024,6 +6123,9 @@ catch_exception_command_1 (enum exception_event_kind ex_event, char *arg,
|
||||||
(ex_event != EX_EVENT_CATCH))
|
(ex_event != EX_EVENT_CATCH))
|
||||||
error ("Unsupported or unknown exception event; cannot catch it");
|
error ("Unsupported or unknown exception event; cannot catch it");
|
||||||
|
|
||||||
|
if (handle_gnu_v3_exceptions (tempflag, cond_string, ex_event, from_tty))
|
||||||
|
return;
|
||||||
|
|
||||||
/* See if we can find a callback routine */
|
/* See if we can find a callback routine */
|
||||||
sal = target_enable_exception_callback (ex_event, 1);
|
sal = target_enable_exception_callback (ex_event, 1);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -184,6 +184,24 @@ enum target_hw_bp_type
|
||||||
hw_execute = 3 /* Execute HW breakpoint */
|
hw_execute = 3 /* Execute HW breakpoint */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* This structure is a collection of function pointers that, if available,
|
||||||
|
will be called instead of the performing the default action for this
|
||||||
|
bptype. */
|
||||||
|
|
||||||
|
struct breakpoint_ops
|
||||||
|
{
|
||||||
|
/* The normal print routine for this breakpoint, called when we
|
||||||
|
hit it. */
|
||||||
|
enum print_stop_action (*print_it) (struct breakpoint *);
|
||||||
|
|
||||||
|
/* Display information about this breakpoint, for "info breakpoints". */
|
||||||
|
void (*print_one) (struct breakpoint *, CORE_ADDR *);
|
||||||
|
|
||||||
|
/* Display information about this breakpoint after setting it (roughly
|
||||||
|
speaking; this is called from "mention"). */
|
||||||
|
void (*print_mention) (struct breakpoint *);
|
||||||
|
};
|
||||||
|
|
||||||
/* Note that the ->silent field is not currently used by any commands
|
/* Note that the ->silent field is not currently used by any commands
|
||||||
(though the code is in there if it was to be, and set_raw_breakpoint
|
(though the code is in there if it was to be, and set_raw_breakpoint
|
||||||
does set it to 0). I implemented it because I thought it would be
|
does set it to 0). I implemented it because I thought it would be
|
||||||
|
|
@ -306,6 +324,9 @@ struct breakpoint
|
||||||
char *exec_pathname;
|
char *exec_pathname;
|
||||||
|
|
||||||
asection *section;
|
asection *section;
|
||||||
|
|
||||||
|
/* Methods associated with this breakpoint. */
|
||||||
|
struct breakpoint_ops *ops;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* The following stuff is an abstract data type "bpstat" ("breakpoint
|
/* The following stuff is an abstract data type "bpstat" ("breakpoint
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue