binutils-gdb/gdb/mi/mi-cmd-catch.c
Pedro Alves 65630365f7 Eliminate catch_exceptions/catch_exceptions_with_msg
This patch gets rid of catch_exceptions / catch_exceptions_with_msg.
The latter is done mostly by getting rid of the three remaining
vestigial libgdb wrapper functions, which are really pointless
nowadays.  This results in a good number of simplifications.

(I checked that Insight doesn't use those functions.)

The gdb.mi/mi-pthreads.exp change is necessary because this actually
fixes a bug, IMO -- the patch stops MI's -thread-select causing output
on the CLI stream.

I.e., before:
 -thread-select 123456789
 &"Thread ID 123456789 not known.\n"
 ^error,msg="Thread ID 123456789 not known."
 (gdb)

After:
 -thread-select 123456789
 ^error,msg="Thread ID 123456789 not known."
 (gdb)

gdb/ChangeLog
2017-10-10  Pedro Alves <palves@redhat.com>
	    Tom Tromey  <tom@tromey.com>

	* breakpoint.c (struct captured_breakpoint_query_args)
	(do_captured_breakpoint_query, gdb_breakpoint_query): Delete.
	(print_breakpoint): New.
	* breakpoint.h (print_breakpoint): Declare.
	* common/common-exceptions.h (enum return_reason): Remove
	references to catch_exceptions.
	* exceptions.c (catch_exceptions, catch_exceptions_with_msg):
	Delete.
	* exceptions.h (catch_exceptions_ftype, catch_exceptions)
	(catch_exception_ftype, catch_exceptions_with_msg): Delete.
	* gdb.h: Delete.
	* gdbthread.h (thread_select): Declare.
	* mi/mi-cmd-break.c: Don't include gdb.h.
	(breakpoint_notify): Use print_breakpoint.
	* mi/mi-cmd-catch.c: Don't include gdb.h.
	* mi/mi-interp.c: Don't include gdb.h.
	(mi_print_breakpoint_for_event): New.
	(mi_breakpoint_created, mi_breakpoint_modified): Use
	mi_print_breakpoint_for_event.
	* mi/mi-main.c: Don't include gdb.h.
	(mi_cmd_thread_select): Parse the global thread ID here.  Use
	thread_select instead of gdb_thread_select.
	(mi_cmd_thread_list_ids): Output "thread-ids" tuple here instead
	of using gdb_list_thread_ids.
	* remote-fileio.c (do_remote_fileio_request): Change type.  Reply
	FILEIO_ENOSYS here.
	(remote_fileio_request): Use TRY/CATCH instead of
	catch_exceptions.
	* symfile-mem.c (struct symbol_file_add_from_memory_args)
	(symbol_file_add_from_memory_wrapper): Delete.
	(add_vsyscall_page): Use TRY/CATCH instead of catch_exceptions.
	* thread.c: Don't include gdb.h.
	(do_captured_list_thread_ids, gdb_list_thread_ids): Delete.
	(thread_alive): Use thread_select.
	(do_captured_thread_select): Delete, parts salvaged as ...
	(thread_select): ... this new function.
	(gdb_thread_select): Delete.

gdb/testsuite/ChangeLog
2017-10-10  Pedro Alves <palves@redhat.com>

	* gdb.mi/mi-pthreads.exp (check_mi_thread_command_set): Don't
	expect CLI output.
2017-10-10 17:01:25 +01:00

237 lines
5.7 KiB
C

/* MI Command Set - catch commands.
Copyright (C) 2012-2017 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();
char *condition = NULL;
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 = 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 needs CONDITION to be xstrdup'ed,
and will assume control of its lifetime. */
if (condition != NULL)
condition = xstrdup (condition);
create_ada_exception_catchpoint (gdbarch, ada_catch_assert,
NULL, 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();
char *condition = NULL;
int enabled = 1;
char *exception_name = NULL;
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 = 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 != NULL)
error (_("\"-e\" and \"-u\" are mutually exclusive"));
scoped_restore restore_breakpoint_reporting = setup_breakpoint_reporting ();
/* create_ada_exception_catchpoint needs EXCEPTION_NAME and CONDITION
to be xstrdup'ed, and will assume control of their lifetime. */
if (exception_name != NULL)
exception_name = xstrdup (exception_name);
if (condition != NULL)
condition = xstrdup (condition);
create_ada_exception_catchpoint (gdbarch, ex_kind,
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);
}