2012-03-01 Pedro Alves <palves@redhat.com>
* common/signals.c (default_target_signal_to_host) (default_target_signal_from_host): Move ... * arch-utils.c: ... here. * arch-utils.h (default_target_signal_to_host) (default_target_signal_from_host): Declare. * common/signals.c (target_signal_from_command): Move ... * infrun.c: ... here. * inferior.h (target_signal_from_command): Declare. * target.h (target_signal_from_command) (default_target_signal_from_host, default_target_signal_to_host): Delete declarations. * common/signals.c (_initialize_signals): Delete.
This commit is contained in:
parent
c9b873354a
commit
ed01b82c02
7 changed files with 53 additions and 52 deletions
|
@ -1,3 +1,20 @@
|
|||
2012-03-01 Pedro Alves <palves@redhat.com>
|
||||
|
||||
* common/signals.c (default_target_signal_to_host)
|
||||
(default_target_signal_from_host): Move ...
|
||||
* arch-utils.c: ... here.
|
||||
* arch-utils.h (default_target_signal_to_host)
|
||||
(default_target_signal_from_host): Declare.
|
||||
|
||||
* common/signals.c (target_signal_from_command): Move ...
|
||||
* infrun.c: ... here.
|
||||
* inferior.h (target_signal_from_command): Declare.
|
||||
* target.h (target_signal_from_command)
|
||||
(default_target_signal_from_host, default_target_signal_to_host):
|
||||
Delete declarations.
|
||||
|
||||
* common/signals.c (_initialize_signals): Delete.
|
||||
|
||||
2012-03-01 Pedro Alves <palves@redhat.com>
|
||||
|
||||
* jit-reader.in (plugin_is_GPL_compatible): Add declarations for
|
||||
|
|
|
@ -793,6 +793,18 @@ default_gen_return_address (struct gdbarch *gdbarch,
|
|||
error (_("This architecture has no method to collect a return address."));
|
||||
}
|
||||
|
||||
int
|
||||
default_target_signal_to_host (struct gdbarch *gdbarch, enum target_signal ts)
|
||||
{
|
||||
return target_signal_to_host (ts);
|
||||
}
|
||||
|
||||
enum target_signal
|
||||
default_target_signal_from_host (struct gdbarch *gdbarch, int signo)
|
||||
{
|
||||
return target_signal_from_host (signo);
|
||||
}
|
||||
|
||||
/* */
|
||||
|
||||
/* -Wmissing-prototypes */
|
||||
|
|
|
@ -172,4 +172,9 @@ extern void default_gen_return_address (struct gdbarch *gdbarch,
|
|||
extern const char *default_auto_charset (void);
|
||||
extern const char *default_auto_wide_charset (void);
|
||||
|
||||
extern enum target_signal default_target_signal_from_host (struct gdbarch *,
|
||||
int);
|
||||
extern int default_target_signal_to_host (struct gdbarch *,
|
||||
enum target_signal);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -649,45 +649,3 @@ target_signal_to_host (enum target_signal oursig)
|
|||
else
|
||||
return targ_signo;
|
||||
}
|
||||
|
||||
#ifndef GDBSERVER
|
||||
|
||||
/* In some circumstances we allow a command to specify a numeric
|
||||
signal. The idea is to keep these circumstances limited so that
|
||||
users (and scripts) develop portable habits. For comparison,
|
||||
POSIX.2 `kill' requires that 1,2,3,6,9,14, and 15 work (and using a
|
||||
numeric signal at all is obsolescent. We are slightly more
|
||||
lenient and allow 1-15 which should match host signal numbers on
|
||||
most systems. Use of symbolic signal names is strongly encouraged. */
|
||||
|
||||
enum target_signal
|
||||
target_signal_from_command (int num)
|
||||
{
|
||||
if (num >= 1 && num <= 15)
|
||||
return (enum target_signal) num;
|
||||
error (_("Only signals 1-15 are valid as numeric signals.\n\
|
||||
Use \"info signals\" for a list of symbolic signals."));
|
||||
}
|
||||
|
||||
extern initialize_file_ftype _initialize_signals; /* -Wmissing-prototype */
|
||||
|
||||
void
|
||||
_initialize_signals (void)
|
||||
{
|
||||
if (strcmp (signals[TARGET_SIGNAL_LAST].string, "TARGET_SIGNAL_MAGIC") != 0)
|
||||
internal_error (__FILE__, __LINE__, "failed internal consistency check");
|
||||
}
|
||||
|
||||
int
|
||||
default_target_signal_to_host (struct gdbarch *gdbarch, enum target_signal ts)
|
||||
{
|
||||
return target_signal_to_host (ts);
|
||||
}
|
||||
|
||||
enum target_signal
|
||||
default_target_signal_from_host (struct gdbarch *gdbarch, int signo)
|
||||
{
|
||||
return target_signal_from_host (signo);
|
||||
}
|
||||
|
||||
#endif /* ! GDBSERVER */
|
||||
|
|
|
@ -645,4 +645,14 @@ extern struct inferior *add_inferior_with_spaces (void);
|
|||
|
||||
extern void update_observer_mode (void);
|
||||
|
||||
/* In some circumstances we allow a command to specify a numeric
|
||||
signal. The idea is to keep these circumstances limited so that
|
||||
users (and scripts) develop portable habits. For comparison,
|
||||
POSIX.2 `kill' requires that 1,2,3,6,9,14, and 15 work (and using a
|
||||
numeric signal at all is obsolescent. We are slightly more lenient
|
||||
and allow 1-15 which should match host signal numbers on most
|
||||
systems. Use of symbolic signal names is strongly encouraged. */
|
||||
|
||||
enum target_signal target_signal_from_command (int num);
|
||||
|
||||
#endif /* !defined (INFERIOR_H) */
|
||||
|
|
|
@ -6445,6 +6445,15 @@ xdb_handle_command (char *args, int from_tty)
|
|||
do_cleanups (old_chain);
|
||||
}
|
||||
|
||||
enum target_signal
|
||||
target_signal_from_command (int num)
|
||||
{
|
||||
if (num >= 1 && num <= 15)
|
||||
return (enum target_signal) num;
|
||||
error (_("Only signals 1-15 are valid as numeric signals.\n\
|
||||
Use \"info signals\" for a list of symbolic signals."));
|
||||
}
|
||||
|
||||
/* Print current contents of the tables set by the handle command.
|
||||
It is possible we should just be printing signals actually used
|
||||
by the current target (but for things to work right when switching
|
||||
|
|
10
gdb/target.h
10
gdb/target.h
|
@ -1827,16 +1827,6 @@ extern int remote_timeout;
|
|||
/* This is for native targets which use a unix/POSIX-style waitstatus. */
|
||||
extern void store_waitstatus (struct target_waitstatus *, int);
|
||||
|
||||
/* These are in common/signals.c, but they're only used by gdb. */
|
||||
extern enum target_signal default_target_signal_from_host (struct gdbarch *,
|
||||
int);
|
||||
extern int default_target_signal_to_host (struct gdbarch *,
|
||||
enum target_signal);
|
||||
|
||||
/* Convert from a number used in a GDB command to an enum target_signal. */
|
||||
extern enum target_signal target_signal_from_command (int);
|
||||
/* End of files in common/signals.c. */
|
||||
|
||||
/* Set the show memory breakpoints mode to show, and installs a cleanup
|
||||
to restore it back to the current value. */
|
||||
extern struct cleanup *make_show_memory_breakpoints_cleanup (int show);
|
||||
|
|
Loading…
Reference in a new issue