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

* ada-lang.c (standard_exc): New static constant. 

(ada_exception_catchpoint_cond_string): Add special handling
        for the predefined exceptions.
This commit is contained in:
Joel Brobecker 2008-09-30 20:42:21 +00:00
parent cdc7bb92c7
commit 3d0b0fa396
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2008-09-30 Joel Brobecker <brobecker@adacore.com>
* ada-lang.c (standard_exc): New static constant.
(ada_exception_catchpoint_cond_string): Add special handling
for the predefined exceptions.
2008-09-30 Joel Brobecker <brobecker@adacore.com>
* ada-lang.c (ADA_RETAIN_DOTS): Delete this dead macro. Update

38
gdb/ada-lang.c
View File

@ -9650,6 +9650,15 @@ enum exception_catchpoint_kind
ex_catch_assert
};
/* Ada's standard exceptions. */
static char *standard_exc[] = {
"constraint_error",
"program_error",
"storage_error",
"tasking_error"
};
typedef CORE_ADDR (ada_unhandled_exception_name_addr_ftype) (void);
/* A structure that describes how to support exception catchpoints
@ -10334,6 +10343,35 @@ ada_exception_breakpoint_ops (enum exception_catchpoint_kind ex)
static char *
ada_exception_catchpoint_cond_string (const char *exp_string)
{
int i;
/* The standard exceptions are a special case. They are defined in
runtime units that have been compiled without debugging info; if
EXP_STRING is the not-fully-qualified name of a standard
exception (e.g. "constraint_error") then, during the evaluation
of the condition expression, the symbol lookup on this name would
*not* return this standard exception. The catchpoint condition
may then be set only on user-defined exceptions which have the
same not-fully-qualified name (e.g. my_package.constraint_error).
To avoid this unexcepted behavior, these standard exceptions are
systematically prefixed by "standard". This means that "catch
exception constraint_error" is rewritten into "catch exception
standard.constraint_error".
If an exception named contraint_error is defined in another package of
the inferior program, then the only way to specify this exception as a
breakpoint condition is to use its fully-qualified named:
e.g. my_package.constraint_error. */
for (i = 0; i < sizeof (standard_exc) / sizeof (char *); i++)
{
if (strcmp (standard_exc [i], exp_string) == 0)
{
return xstrprintf ("long_integer (e) = long_integer (&standard.%s)",
exp_string);
}
}
return xstrprintf ("long_integer (e) = long_integer (&%s)", exp_string);
}