mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
30056ea04a
Adds some MI commands to catch C++ exceptions. The new commands are -catch-throw, -catch-rethrow, and -catch-catch, these all correspond to the CLI commands 'catch throw', 'catch rethrow', and 'catch catch'. Each MI command takes two optional arguments, '-t' has the effect of calling 'tcatch' instead of 'catch', for example: (gdb) -catch-throw -t Is the same as: (gdb) tcatch throw There is also a '-r REGEXP' argument that can supply a regexp to match against the exception type, so: (gdb) -catch-catch -r PATTERN Is the same as: (gdb) catch catch PATTERN The change in print_mention_exception_catchpoint might seem a little strange; changing the output from using ui_out::field_int and ui_out::text to using ui_out::message. The print_mention_exception_catchpoint is used as the 'print_mention' method for the exception catchpoint breakpoint object. Most of the other 'print_mention' methods (see breakpoint.c) use either printf_filtered, of ui_out::message. Using field_int was causing an unexpected field to be added to the MI output. Here's the output without the change in print_mention_exception_catchpoint: (gdb) -catch-throw ^done,bkptno="1",bkpt={number="1",type="breakpoint",disp="keep", enabled="y",addr="0x00000000004006c0", what="exception throw",catch-type="throw", thread-groups=["i1"],times="0"} Notice the breakpoint number appears in both the 'bkptno' field, and the 'number' field within the 'bkpt' tuple. Here's the output with the change in print_mention_exception_catchpoint: (gdb) -catch-throw ^done,bkpt={number="1",type="breakpoint",disp="keep", enabled="y",addr="0x00000000004006c0", what="exception throw",catch-type="throw", thread-groups=["i1"],times="0"} gdb/ChangeLog: * NEWS: Mention new MI commands. * break-catch-throw.c (enum exception_event_kind): Move to breakpoint.h. (print_mention_exception_catchpoint): Output text as a single message. (catch_exception_command_1): Rename to... (catch_exception_event): ...this, make non-static, update header command, and change some parameter types. (catch_catch_command): Update for changes to catch_exception_command_1. (catch_throw_command): Likewise. (catch_rethrow_command): Likewise. * breakpoint.c (enum exception_event_kind): Delete. * breakpoint.h (enum exception_event_kind): Moved here from break-catch-throw.c. (catch_exception_event): Declare. * mi/mi-cmd-catch.c (mi_cmd_catch_exception_event): New function. (mi_cmd_catch_throw): New function. (mi_cmd_catch_rethrow): New function. (mi_cmd_catch_catch): New function. * mi/mi-cmds.c (mi_cmds): Add 'catch-throw', 'catch-rethrow', and 'catch-catch' entries. * mi/mi-cmds.h (mi_cmd_catch_throw): Declare. (mi_cmd_catch_rethrow): Declare. (mi_cmd_catch_catch): Declare. gdb/doc/ChangeLog: * gdb.texinfo (GDB/MI Catchpoint Commands): Add menu entry to new node. (C++ Exception GDB/MI Catchpoint Commands): New node to describe new MI commands. gdb/testsuite/ChangeLog: * gdb.mi/mi-catch-cpp-exceptions.cc: New file. * gdb.mi/mi-catch-cpp-exceptions.exp: New file. * lib/mi-support.exp (mi_expect_stop): Handle 'exception-caught' as a stop reason.
362 lines
8.1 KiB
C
362 lines
8.1 KiB
C
/* MI Command Set - catch commands.
|
|
Copyright (C) 2012-2019 Free Software Foundation, Inc.
|
|
|
|
Contributed by Intel Corporation.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "arch-utils.h"
|
|
#include "breakpoint.h"
|
|
#include "ada-lang.h"
|
|
#include "mi-cmds.h"
|
|
#include "mi-getopt.h"
|
|
#include "mi-cmd-break.h"
|
|
|
|
/* Handler for the -catch-assert command. */
|
|
|
|
void
|
|
mi_cmd_catch_assert (const char *cmd, char *argv[], int argc)
|
|
{
|
|
struct gdbarch *gdbarch = get_current_arch();
|
|
std::string condition;
|
|
int enabled = 1;
|
|
int temp = 0;
|
|
|
|
int oind = 0;
|
|
char *oarg;
|
|
|
|
enum opt
|
|
{
|
|
OPT_CONDITION, OPT_DISABLED, OPT_TEMP,
|
|
};
|
|
static const struct mi_opt opts[] =
|
|
{
|
|
{ "c", OPT_CONDITION, 1},
|
|
{ "d", OPT_DISABLED, 0 },
|
|
{ "t", OPT_TEMP, 0 },
|
|
{ 0, 0, 0 }
|
|
};
|
|
|
|
for (;;)
|
|
{
|
|
int opt = mi_getopt ("-catch-assert", argc, argv, opts,
|
|
&oind, &oarg);
|
|
|
|
if (opt < 0)
|
|
break;
|
|
|
|
switch ((enum opt) opt)
|
|
{
|
|
case OPT_CONDITION:
|
|
condition.assign (oarg);
|
|
break;
|
|
case OPT_DISABLED:
|
|
enabled = 0;
|
|
break;
|
|
case OPT_TEMP:
|
|
temp = 1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* This command does not accept any argument. Make sure the user
|
|
did not provide any. */
|
|
if (oind != argc)
|
|
error (_("Invalid argument: %s"), argv[oind]);
|
|
|
|
scoped_restore restore_breakpoint_reporting = setup_breakpoint_reporting ();
|
|
create_ada_exception_catchpoint (gdbarch, ada_catch_assert, std::string (),
|
|
condition, temp, enabled, 0);
|
|
}
|
|
|
|
/* Handler for the -catch-exception command. */
|
|
|
|
void
|
|
mi_cmd_catch_exception (const char *cmd, char *argv[], int argc)
|
|
{
|
|
struct gdbarch *gdbarch = get_current_arch();
|
|
std::string condition;
|
|
int enabled = 1;
|
|
std::string exception_name;
|
|
int temp = 0;
|
|
enum ada_exception_catchpoint_kind ex_kind = ada_catch_exception;
|
|
|
|
int oind = 0;
|
|
char *oarg;
|
|
|
|
enum opt
|
|
{
|
|
OPT_CONDITION, OPT_DISABLED, OPT_EXCEPTION_NAME, OPT_TEMP,
|
|
OPT_UNHANDLED,
|
|
};
|
|
static const struct mi_opt opts[] =
|
|
{
|
|
{ "c", OPT_CONDITION, 1},
|
|
{ "d", OPT_DISABLED, 0 },
|
|
{ "e", OPT_EXCEPTION_NAME, 1 },
|
|
{ "t", OPT_TEMP, 0 },
|
|
{ "u", OPT_UNHANDLED, 0},
|
|
{ 0, 0, 0 }
|
|
};
|
|
|
|
for (;;)
|
|
{
|
|
int opt = mi_getopt ("-catch-exception", argc, argv, opts,
|
|
&oind, &oarg);
|
|
|
|
if (opt < 0)
|
|
break;
|
|
|
|
switch ((enum opt) opt)
|
|
{
|
|
case OPT_CONDITION:
|
|
condition.assign (oarg);
|
|
break;
|
|
case OPT_DISABLED:
|
|
enabled = 0;
|
|
break;
|
|
case OPT_EXCEPTION_NAME:
|
|
exception_name = oarg;
|
|
break;
|
|
case OPT_TEMP:
|
|
temp = 1;
|
|
break;
|
|
case OPT_UNHANDLED:
|
|
ex_kind = ada_catch_exception_unhandled;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* This command does not accept any argument. Make sure the user
|
|
did not provide any. */
|
|
if (oind != argc)
|
|
error (_("Invalid argument: %s"), argv[oind]);
|
|
|
|
/* Specifying an exception name does not make sense when requesting
|
|
an unhandled exception breakpoint. */
|
|
if (ex_kind == ada_catch_exception_unhandled && !exception_name.empty ())
|
|
error (_("\"-e\" and \"-u\" are mutually exclusive"));
|
|
|
|
scoped_restore restore_breakpoint_reporting = setup_breakpoint_reporting ();
|
|
create_ada_exception_catchpoint (gdbarch, ex_kind,
|
|
exception_name,
|
|
condition, temp, enabled, 0);
|
|
}
|
|
|
|
/* Handler for the -catch-handlers command. */
|
|
|
|
void
|
|
mi_cmd_catch_handlers (const char *cmd, char *argv[], int argc)
|
|
{
|
|
struct gdbarch *gdbarch = get_current_arch ();
|
|
std::string condition;
|
|
int enabled = 1;
|
|
std::string exception_name;
|
|
int temp = 0;
|
|
|
|
int oind = 0;
|
|
char *oarg;
|
|
|
|
enum opt
|
|
{
|
|
OPT_CONDITION, OPT_DISABLED, OPT_EXCEPTION_NAME, OPT_TEMP
|
|
};
|
|
static const struct mi_opt opts[] =
|
|
{
|
|
{ "c", OPT_CONDITION, 1},
|
|
{ "d", OPT_DISABLED, 0 },
|
|
{ "e", OPT_EXCEPTION_NAME, 1 },
|
|
{ "t", OPT_TEMP, 0 },
|
|
{ 0, 0, 0 }
|
|
};
|
|
|
|
for (;;)
|
|
{
|
|
int opt = mi_getopt ("-catch-handlers", argc, argv, opts,
|
|
&oind, &oarg);
|
|
|
|
if (opt < 0)
|
|
break;
|
|
|
|
switch ((enum opt) opt)
|
|
{
|
|
case OPT_CONDITION:
|
|
condition.assign (oarg);
|
|
break;
|
|
case OPT_DISABLED:
|
|
enabled = 0;
|
|
break;
|
|
case OPT_EXCEPTION_NAME:
|
|
exception_name = oarg;
|
|
break;
|
|
case OPT_TEMP:
|
|
temp = 1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* This command does not accept any argument. Make sure the user
|
|
did not provide any. */
|
|
if (oind != argc)
|
|
error (_("Invalid argument: %s"), argv[oind]);
|
|
|
|
scoped_restore restore_breakpoint_reporting
|
|
= setup_breakpoint_reporting ();
|
|
create_ada_exception_catchpoint (gdbarch, ada_catch_handlers,
|
|
exception_name,
|
|
condition, temp, enabled, 0);
|
|
}
|
|
|
|
/* Common path for the -catch-load and -catch-unload. */
|
|
|
|
static void
|
|
mi_catch_load_unload (int load, char *argv[], int argc)
|
|
{
|
|
const char *actual_cmd = load ? "-catch-load" : "-catch-unload";
|
|
int temp = 0;
|
|
int enabled = 1;
|
|
int oind = 0;
|
|
char *oarg;
|
|
enum opt
|
|
{
|
|
OPT_TEMP,
|
|
OPT_DISABLED,
|
|
};
|
|
static const struct mi_opt opts[] =
|
|
{
|
|
{ "t", OPT_TEMP, 0 },
|
|
{ "d", OPT_DISABLED, 0 },
|
|
{ 0, 0, 0 }
|
|
};
|
|
|
|
for (;;)
|
|
{
|
|
int opt = mi_getopt (actual_cmd, argc, argv, opts,
|
|
&oind, &oarg);
|
|
|
|
if (opt < 0)
|
|
break;
|
|
|
|
switch ((enum opt) opt)
|
|
{
|
|
case OPT_TEMP:
|
|
temp = 1;
|
|
break;
|
|
case OPT_DISABLED:
|
|
enabled = 0;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (oind >= argc)
|
|
error (_("-catch-load/unload: Missing <library name>"));
|
|
if (oind < argc -1)
|
|
error (_("-catch-load/unload: Garbage following the <library name>"));
|
|
|
|
scoped_restore restore_breakpoint_reporting = setup_breakpoint_reporting ();
|
|
add_solib_catchpoint (argv[oind], load, temp, enabled);
|
|
}
|
|
|
|
/* Handler for the -catch-load. */
|
|
|
|
void
|
|
mi_cmd_catch_load (const char *cmd, char *argv[], int argc)
|
|
{
|
|
mi_catch_load_unload (1, argv, argc);
|
|
}
|
|
|
|
|
|
/* Handler for the -catch-unload. */
|
|
|
|
void
|
|
mi_cmd_catch_unload (const char *cmd, char *argv[], int argc)
|
|
{
|
|
mi_catch_load_unload (0, argv, argc);
|
|
}
|
|
|
|
/* Core handler for -catch-throw, -catch-rethrow, and -catch-catch
|
|
commands. The argument handling for all of these is identical, we just
|
|
pass KIND through to GDB's core to select the correct event type. */
|
|
|
|
static void
|
|
mi_cmd_catch_exception_event (enum exception_event_kind kind,
|
|
const char *cmd, char *argv[], int argc)
|
|
{
|
|
char *regex = NULL;
|
|
bool temp = false;
|
|
int oind = 0;
|
|
char *oarg;
|
|
enum opt
|
|
{
|
|
OPT_TEMP,
|
|
OPT_REGEX,
|
|
};
|
|
static const struct mi_opt opts[] =
|
|
{
|
|
{ "t", OPT_TEMP, 0 },
|
|
{ "r", OPT_REGEX, 1 },
|
|
{ 0, 0, 0 }
|
|
};
|
|
|
|
for (;;)
|
|
{
|
|
int opt = mi_getopt (cmd, argc, argv, opts,
|
|
&oind, &oarg);
|
|
|
|
if (opt < 0)
|
|
break;
|
|
|
|
switch ((enum opt) opt)
|
|
{
|
|
case OPT_TEMP:
|
|
temp = true;
|
|
break;
|
|
case OPT_REGEX:
|
|
regex = oarg;
|
|
break;
|
|
}
|
|
}
|
|
|
|
scoped_restore restore_breakpoint_reporting = setup_breakpoint_reporting ();
|
|
catch_exception_event (kind, regex, temp, 0 /* from_tty */);
|
|
}
|
|
|
|
/* Handler for -catch-throw. */
|
|
|
|
void
|
|
mi_cmd_catch_throw (const char *cmd, char *argv[], int argc)
|
|
{
|
|
mi_cmd_catch_exception_event (EX_EVENT_THROW, cmd, argv, argc);
|
|
}
|
|
|
|
/* Handler for -catch-rethrow. */
|
|
|
|
void
|
|
mi_cmd_catch_rethrow (const char *cmd, char *argv[], int argc)
|
|
{
|
|
mi_cmd_catch_exception_event (EX_EVENT_RETHROW, cmd, argv, argc);
|
|
}
|
|
|
|
/* Handler for -catch-catch. */
|
|
|
|
void
|
|
mi_cmd_catch_catch (const char *cmd, char *argv[], int argc)
|
|
{
|
|
mi_cmd_catch_exception_event (EX_EVENT_CATCH, cmd, argv, argc);
|
|
}
|
|
|