espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-08-06 14:49:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make exception_catchpoint inherit base_breakpoint instead of catchpoint

Browse Source 
exception_catchpoint is really a code breakpoint, with locations set
by sals, re-set like other code breakpoints, etc., so make it inherit
base_breakpoint.

This adds a bit of duplicated code to exception_catchpoint's ctor
(copied from struct catchpoint's ctor), but it will be eliminated in a
following patch.

Change-Id: I9fbb2927491120e9744a4f5e5cb5e6870ca07009
This commit is contained in:
Pedro Alves
2022-05-07 01:18:34 +01:00
parent 7a3e3265ed
commit 249dfeafc9
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,15 +63,17 @@ static const struct exception_names exception_functions[] =
{ "-probe-stap libstdcxx:catch", "__cxa_begin_catch" }
};
/* The type of an exception catchpoint. */
/* The type of an exception catchpoint. Unlike most catchpoints, this
one is implemented with code breakpoints, so it inherits struct
base_breakpoint, not struct catchpoint. */
struct exception_catchpoint : public catchpoint
struct exception_catchpoint : public base_breakpoint
{
exception_catchpoint (struct gdbarch *gdbarch,
bool temp, const char *cond_string,
bool temp, const char *cond_string_,
enum exception_event_kind kind_,
std::string &&except_rx)
: catchpoint (gdbarch, temp, cond_string),
: base_breakpoint (gdbarch, bp_catchpoint),
kind (kind_),
exception_rx (std::move (except_rx)),
pattern (exception_rx.empty ()
@ -79,6 +81,12 @@ struct exception_catchpoint : public catchpoint
: new compiled_regex (exception_rx.c_str (), REG_NOSUB,
_("invalid type-matching regexp")))
{
if (cond_string_ != nullptr)
cond_string = make_unique_xstrdup (cond_string_);
disposition = temp ? disp_del : disp_donttouch;
pspace = current_program_space;
re_set ();
}
void re_set () override;
@ -375,8 +383,6 @@ handle_gnu_v3_exceptions (int tempflag, std::string &&except_rx,
(new exception_catchpoint (gdbarch, tempflag, cond_string,
ex_event, std::move (except_rx)));
cp->re_set ();
install_breakpoint (0, std::move (cp), 1);
}