darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move catch_command_errors and catch_command_errors_const to main.c

Browse source 
We'll need to add error handling code to commands run before the event
loop starts (commands in .gdbinit, -ex commands, etc.).  Turns out
those are run through catch_command_errors, and, catch_command_errors
is used nowhere else.  Move it (and the _const variant) to main.c, so
that we can further specialize it freely.

gdb/
2014-07-14  Pedro Alves  <palves@redhat.com>

	* exceptions.c (catch_command_errors, catch_command_errors_const):
	Moved to main.c.
	* exceptions.h (catch_command_errors_ftype)
	(catch_command_errors_const_ftype): Moved to main.c.
	(catch_command_errors, catch_command_errors_const): Delete
	declarations.
	* main.c (catch_command_errors_ftype)
	(catch_command_errors_const_ftype): Moved here from exceptions.h.
	(catch_command_errors, catch_command_errors_const)): Moved here
	from exceptions.c and make static.
This commit is contained in:
Pedro Alves 2014-07-14 19:55:31 +01:00
parent feefc97b59
commit 9d1e69a214
4 changed files with 57 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gdb/ChangeLog
View file

@ -1,3 +1,16 @@
2014-07-14 Pedro Alves <palves@redhat.com>
* exceptions.c (catch_command_errors, catch_command_errors_const):
Moved to main.c.
* exceptions.h (catch_command_errors_ftype)
(catch_command_errors_const_ftype): Moved to main.c.
(catch_command_errors, catch_command_errors_const): Delete
declarations.
* main.c (catch_command_errors_ftype)
(catch_command_errors_const_ftype): Moved here from exceptions.h.
(catch_command_errors, catch_command_errors_const)): Moved here
from exceptions.c and make static.
2014-07-14 Pedro Alves <palves@redhat.com>
* exceptions.c (print_any_exception): Delete.

32
gdb/exceptions.c
View file

@ -521,35 +521,3 @@ catch_errors (catch_errors_ftype *func, void *func_args, char *errstring,
return 0;
return val;
}
int
catch_command_errors (catch_command_errors_ftype *command,
char *arg, int from_tty, return_mask mask)
{
volatile struct gdb_exception e;
TRY_CATCH (e, mask)
{
command (arg, from_tty);
}
exception_print (gdb_stderr, e);
if (e.reason < 0)
return 0;
return 1;
}
int
catch_command_errors_const (catch_command_errors_const_ftype *command,
const char *arg, int from_tty, return_mask mask)
{
volatile struct gdb_exception e;
TRY_CATCH (e, mask)
{
command (arg, from_tty);
}
exception_print (gdb_stderr, e);
if (e.reason < 0)
return 0;
return 1;
}

13
gdb/exceptions.h
View file

@ -255,17 +255,4 @@ extern int catch_exceptions_with_msg (struct ui_out *uiout,
typedef int (catch_errors_ftype) (void *);
extern int catch_errors (catch_errors_ftype *, void *, char *, return_mask);
/* Template to catch_errors() that wraps calls to command
functions. */
typedef void (catch_command_errors_ftype) (char *, int);
extern int catch_command_errors (catch_command_errors_ftype *func,
char *arg, int from_tty, return_mask);
/* Like catch_command_errors, but works with const command and args. */
typedef void (catch_command_errors_const_ftype) (const char *, int);
extern int catch_command_errors_const (catch_command_errors_const_ftype *func,
const char *arg, int from_tty, return_mask);
#endif

44
gdb/main.c
View file

@ -337,6 +337,50 @@ captured_command_loop (void *data)
return 1;
}
/* Type of the command callback passed to catch_command_errors. */
typedef void (catch_command_errors_ftype) (char *, int);
/* Wrap calls to commands run before the event loop is started. */
static int
catch_command_errors (catch_command_errors_ftype *command,
char *arg, int from_tty, return_mask mask)
{
volatile struct gdb_exception e;
TRY_CATCH (e, mask)
{
command (arg, from_tty);
}
exception_print (gdb_stderr, e);
if (e.reason < 0)
return 0;
return 1;
}
/* Type of the command callback passed to catch_command_errors_const. */
typedef void (catch_command_errors_const_ftype) (const char *, int);
/* Like catch_command_errors, but works with const command and args. */
static int
catch_command_errors_const (catch_command_errors_const_ftype *command,
const char *arg, int from_tty, return_mask mask)
{
volatile struct gdb_exception e;
TRY_CATCH (e, mask)
{
command (arg, from_tty);
}
exception_print (gdb_stderr, e);
if (e.reason < 0)
return 0;
return 1;
}
/* Arguments of --command option and its counterpart. */
typedef struct cmdarg {
/* Type of this option. */