OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* break-catch-throw.c (struct exception_names): New. 

(exception_functions): Change type.
	(re_set_exception_catchpoint): Look for SDT probes.
This commit is contained in:
Tom Tromey 2013-04-15 18:06:42 +00:00
parent 15a73f5615
commit fc4746a2bd
2 changed files with 49 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2013-04-15 Tom Tromey <tromey@redhat.com>
* break-catch-throw.c (struct exception_names): New.
(exception_functions): Change type.
(re_set_exception_catchpoint): Look for SDT probes.
2013-04-15 Tom Tromey <tromey@redhat.com>
PR c++/10119:

56
gdb/break-catch-throw.c
View File

@ -31,6 +31,7 @@
#include "mi/mi-common.h"
#include "exceptions.h"
#include "linespec.h"
#include "probe.h"
/* Enums for exception-handling support. */
enum exception_event_kind
@ -40,13 +41,29 @@ enum exception_event_kind
EX_EVENT_CATCH
};
/* Names of the ordinary functions on which to break. This is indexed
by exception_event_kind. */
static const char * const exception_functions[] =
/* Each spot where we may place an exception-related catchpoint has
two names: the SDT probe point and the function name. This
structure holds both. */
struct exception_names
{
"__cxa_throw",
"__cxa_rethrow",
"__cxa_begin_catch"
/* The name of the probe point to try, in the form accepted by
'parse_probes'. */
const char *probe;
/* The name of the corresponding function. */
const char *function;
};
/* Names of the probe points and functions on which to break. This is
indexed by exception_event_kind. */
static const struct exception_names exception_functions[] =
{
{ "-probe-stap libstdcxx:throw", "__cxa_throw" },
{ "-probe-stap libstdcxx:rethrow", "__cxa_rethrow" },
{ "-probe-stap libstdcxx:catch", "__cxa_begin_catch" }
};
static struct breakpoint_ops gnu_v3_exception_catchpoint_ops;
@ -85,17 +102,30 @@ re_set_exception_catchpoint (struct breakpoint *self)
volatile struct gdb_exception e;
struct cleanup *cleanup;
enum exception_event_kind kind = classify_exception_breakpoint (self);
int pass;
TRY_CATCH (e, RETURN_MASK_ERROR)
for (pass = 0; sals.sals == NULL && pass < 2; ++pass)
{
char *spec = ASTRDUP (exception_functions[kind]);
TRY_CATCH (e, RETURN_MASK_ERROR)
{
char *spec;
self->ops->decode_linespec (self, &spec, &sals);
if (pass == 0)
{
spec = ASTRDUP (exception_functions[kind].probe);
sals = parse_probes (&spec, NULL);
}
else
{
spec = ASTRDUP (exception_functions[kind].function);
self->ops->decode_linespec (self, &spec, &sals);
}
}
/* NOT_FOUND_ERROR just means the breakpoint will be pending, so
let it through. */
if (e.reason < 0 && e.error != NOT_FOUND_ERROR)
throw_exception (e);
}
/* NOT_FOUND_ERROR just means the breakpoint will be pending, so let
it through. */
if (e.reason < 0 && e.error != NOT_FOUND_ERROR)
throw_exception (e);
cleanup = make_cleanup (xfree, sals.sals);
update_breakpoint_locations (self, sals, sals_end);