riscv
/
binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

* target.c, target.h: New variables target_activity_function and 

target_activity_fd.
	* inflow.c, inferior.h: New functions set_sigio_trap and
	clear_sigio_trap.
	* inftarg.c (child_wait), procfs.c (wait_fd): Call them.
gdb-4_18-branch
Jim Kingdon 33 years ago
parent
6731b89c4b
commit
429f1c9f46
3 changed files with 18 additions and 328 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      gdb/ChangeLog
  2. 336
      gdb/inftarg.c
  3. 2
      gdb/procfs.c

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
Thu May 19 09:56:20 1994 Jim Kingdon (kingdon@lioth.cygnus.com)
* target.c, target.h: New variables target_activity_function and
target_activity_fd.
* inflow.c, inferior.h: New functions set_sigio_trap and
clear_sigio_trap.
* inftarg.c (child_wait), procfs.c (wait_fd): Call them.
Wed May 18 13:01:55 1994 Doug Evans (dje@canuck.cygnus.com)
* remote-sim.h (sim_verbose): Delete.

336
gdb/inftarg.c
View File

@ -31,12 +31,10 @@ static void
child_prepare_to_store PARAMS ((void));
#ifndef CHILD_WAIT
static int
child_wait PARAMS ((int, struct target_waitstatus *));
static int child_wait PARAMS ((int, struct target_waitstatus *));
#endif /* CHILD_WAIT */
static void
child_open PARAMS ((char *, int));
static void child_open PARAMS ((char *, int));
static void
child_files_info PARAMS ((struct target_ops *));
@ -53,8 +51,7 @@ ptrace_me PARAMS ((void));
static void
ptrace_him PARAMS ((int));
static void
child_create_inferior PARAMS ((char *, char *, char **));
static void child_create_inferior PARAMS ((char *, char *, char **));
static void
child_mourn_inferior PARAMS ((void));
@ -67,327 +64,6 @@ extern char **environ;
/* Forward declaration */
extern struct target_ops child_ops;
/* Convert host signal to our signals. */
enum target_signal
target_signal_from_host (hostsig)
int hostsig;
{
/* A switch statement would make sense but would require special kludges
to deal with the cases where more than one signal has the same number. */
if (hostsig == 0) return TARGET_SIGNAL_0;
#if defined (SIGHUP)
if (hostsig == SIGHUP) return TARGET_SIGNAL_HUP;
#endif
#if defined (SIGINT)
if (hostsig == SIGINT) return TARGET_SIGNAL_INT;
#endif
#if defined (SIGQUIT)
if (hostsig == SIGQUIT) return TARGET_SIGNAL_QUIT;
#endif
#if defined (SIGILL)
if (hostsig == SIGILL) return TARGET_SIGNAL_ILL;
#endif
#if defined (SIGTRAP)
if (hostsig == SIGTRAP) return TARGET_SIGNAL_TRAP;
#endif
#if defined (SIGABRT)
if (hostsig == SIGABRT) return TARGET_SIGNAL_ABRT;
#endif
#if defined (SIGEMT)
if (hostsig == SIGEMT) return TARGET_SIGNAL_EMT;
#endif
#if defined (SIGFPE)
if (hostsig == SIGFPE) return TARGET_SIGNAL_FPE;
#endif
#if defined (SIGKILL)
if (hostsig == SIGKILL) return TARGET_SIGNAL_KILL;
#endif
#if defined (SIGBUS)
if (hostsig == SIGBUS) return TARGET_SIGNAL_BUS;
#endif
#if defined (SIGSEGV)
if (hostsig == SIGSEGV) return TARGET_SIGNAL_SEGV;
#endif
#if defined (SIGSYS)
if (hostsig == SIGSYS) return TARGET_SIGNAL_SYS;
#endif
#if defined (SIGPIPE)
if (hostsig == SIGPIPE) return TARGET_SIGNAL_PIPE;
#endif
#if defined (SIGALRM)
if (hostsig == SIGALRM) return TARGET_SIGNAL_ALRM;
#endif
#if defined (SIGTERM)
if (hostsig == SIGTERM) return TARGET_SIGNAL_TERM;
#endif
#if defined (SIGUSR1)
if (hostsig == SIGUSR1) return TARGET_SIGNAL_USR1;
#endif
#if defined (SIGUSR2)
if (hostsig == SIGUSR2) return TARGET_SIGNAL_USR2;
#endif
#if defined (SIGCLD)
if (hostsig == SIGCLD) return TARGET_SIGNAL_CHLD;
#endif
#if defined (SIGCHLD)
if (hostsig == SIGCHLD) return TARGET_SIGNAL_CHLD;
#endif
#if defined (SIGPWR)
if (hostsig == SIGPWR) return TARGET_SIGNAL_PWR;
#endif
#if defined (SIGWINCH)
if (hostsig == SIGWINCH) return TARGET_SIGNAL_WINCH;
#endif
#if defined (SIGURG)
if (hostsig == SIGURG) return TARGET_SIGNAL_URG;
#endif
#if defined (SIGIO)
if (hostsig == SIGIO) return TARGET_SIGNAL_IO;
#endif
#if defined (SIGPOLL)
if (hostsig == SIGPOLL) return TARGET_SIGNAL_POLL;
#endif
#if defined (SIGSTOP)
if (hostsig == SIGSTOP) return TARGET_SIGNAL_STOP;
#endif
#if defined (SIGTSTP)
if (hostsig == SIGTSTP) return TARGET_SIGNAL_TSTP;
#endif
#if defined (SIGCONT)
if (hostsig == SIGCONT) return TARGET_SIGNAL_CONT;
#endif
#if defined (SIGTTIN)
if (hostsig == SIGTTIN) return TARGET_SIGNAL_TTIN;
#endif
#if defined (SIGTTOU)
if (hostsig == SIGTTOU) return TARGET_SIGNAL_TTOU;
#endif
#if defined (SIGVTALRM)
if (hostsig == SIGVTALRM) return TARGET_SIGNAL_VTALRM;
#endif
#if defined (SIGPROF)
if (hostsig == SIGPROF) return TARGET_SIGNAL_PROF;
#endif
#if defined (SIGXCPU)
if (hostsig == SIGXCPU) return TARGET_SIGNAL_XCPU;
#endif
#if defined (SIGXFSZ)
if (hostsig == SIGXFSZ) return TARGET_SIGNAL_XFSZ;
#endif
#if defined (SIGWIND)
if (hostsig == SIGWIND) return TARGET_SIGNAL_WIND;
#endif
#if defined (SIGPHONE)
if (hostsig == SIGPHONE) return TARGET_SIGNAL_PHONE;
#endif
#if defined (SIGLOST)
if (hostsig == SIGLOST) return TARGET_SIGNAL_LOST;
#endif
#if defined (SIGWAITING)
if (hostsig == SIGWAITING) return TARGET_SIGNAL_WAITING;
#endif
#if defined (SIGLWP)
if (hostsig == SIGLWP) return TARGET_SIGNAL_LWP;
#endif
#if defined (SIGDANGER)
if (hostsig == SIGDANGER) return TARGET_SIGNAL_DANGER;
#endif
#if defined (SIGGRANT)
if (hostsig == SIGGRANT) return TARGET_SIGNAL_GRANT;
#endif
#if defined (SIGRETRACT)
if (hostsig == SIGRETRACT) return TARGET_SIGNAL_RETRACT;
#endif
#if defined (SIGMSG)
if (hostsig == SIGMSG) return TARGET_SIGNAL_MSG;
#endif
#if defined (SIGSOUND)
if (hostsig == SIGSOUND) return TARGET_SIGNAL_SOUND;
#endif
#if defined (SIGSAK)
if (hostsig == SIGSAK) return TARGET_SIGNAL_SAK;
#endif
return TARGET_SIGNAL_UNKNOWN;
}
int
target_signal_to_host (oursig)
enum target_signal oursig;
{
switch (oursig)
{
case TARGET_SIGNAL_0: return 0;
#if defined (SIGHUP)
case TARGET_SIGNAL_HUP: return SIGHUP;
#endif
#if defined (SIGINT)
case TARGET_SIGNAL_INT: return SIGINT;
#endif
#if defined (SIGQUIT)
case TARGET_SIGNAL_QUIT: return SIGQUIT;
#endif
#if defined (SIGILL)
case TARGET_SIGNAL_ILL: return SIGILL;
#endif
#if defined (SIGTRAP)
case TARGET_SIGNAL_TRAP: return SIGTRAP;
#endif
#if defined (SIGABRT)
case TARGET_SIGNAL_ABRT: return SIGABRT;
#endif
#if defined (SIGEMT)
case TARGET_SIGNAL_EMT: return SIGEMT;
#endif
#if defined (SIGFPE)
case TARGET_SIGNAL_FPE: return SIGFPE;
#endif
#if defined (SIGKILL)
case TARGET_SIGNAL_KILL: return SIGKILL;
#endif
#if defined (SIGBUS)
case TARGET_SIGNAL_BUS: return SIGBUS;
#endif
#if defined (SIGSEGV)
case TARGET_SIGNAL_SEGV: return SIGSEGV;
#endif
#if defined (SIGSYS)
case TARGET_SIGNAL_SYS: return SIGSYS;
#endif
#if defined (SIGPIPE)
case TARGET_SIGNAL_PIPE: return SIGPIPE;
#endif
#if defined (SIGALRM)
case TARGET_SIGNAL_ALRM: return SIGALRM;
#endif
#if defined (SIGTERM)
case TARGET_SIGNAL_TERM: return SIGTERM;
#endif
#if defined (SIGUSR1)
case TARGET_SIGNAL_USR1: return SIGUSR1;
#endif
#if defined (SIGUSR2)
case TARGET_SIGNAL_USR2: return SIGUSR2;
#endif
#if defined (SIGCHLD) || defined (SIGCLD)
case TARGET_SIGNAL_CHLD:
#if defined (SIGCHLD)
return SIGCHLD;
#else
return SIGCLD;
#endif
#endif /* SIGCLD or SIGCHLD */
#if defined (SIGPWR)
case TARGET_SIGNAL_PWR: return SIGPWR;
#endif
#if defined (SIGWINCH)
case TARGET_SIGNAL_WINCH: return SIGWINCH;
#endif
#if defined (SIGURG)
case TARGET_SIGNAL_URG: return SIGURG;
#endif
#if defined (SIGIO)
case TARGET_SIGNAL_IO: return SIGIO;
#endif
#if defined (SIGPOLL)
case TARGET_SIGNAL_POLL: return SIGPOLL;
#endif
#if defined (SIGSTOP)
case TARGET_SIGNAL_STOP: return SIGSTOP;
#endif
#if defined (SIGTSTP)
case TARGET_SIGNAL_TSTP: return SIGTSTP;
#endif
#if defined (SIGCONT)
case TARGET_SIGNAL_CONT: return SIGCONT;
#endif
#if defined (SIGTTIN)
case TARGET_SIGNAL_TTIN: return SIGTTIN;
#endif
#if defined (SIGTTOU)
case TARGET_SIGNAL_TTOU: return SIGTTOU;
#endif
#if defined (SIGVTALRM)
case TARGET_SIGNAL_VTALRM: return SIGVTALRM;
#endif
#if defined (SIGPROF)
case TARGET_SIGNAL_PROF: return SIGPROF;
#endif
#if defined (SIGXCPU)
case TARGET_SIGNAL_XCPU: return SIGXCPU;
#endif
#if defined (SIGXFSZ)
case TARGET_SIGNAL_XFSZ: return SIGXFSZ;
#endif
#if defined (SIGWIND)
case TARGET_SIGNAL_WIND: return SIGWIND;
#endif
#if defined (SIGPHONE)
case TARGET_SIGNAL_PHONE: return SIGPHONE;
#endif
#if defined (SIGLOST)
case TARGET_SIGNAL_LOST: return SIGLOST;
#endif
#if defined (SIGWAITING)
case TARGET_SIGNAL_WAITING: return SIGWAITING;
#endif
#if defined (SIGLWP)
case TARGET_SIGNAL_LWP: return SIGLWP;
#endif
#if defined (SIGDANGER)
case TARGET_SIGNAL_DANGER: return SIGDANGER;
#endif
#if defined (SIGGRANT)
case TARGET_SIGNAL_GRANT: return SIGGRANT;
#endif
#if defined (SIGRETRACT)
case TARGET_SIGNAL_RETRACT: return SIGRETRACT;
#endif
#if defined (SIGMSG)
case TARGET_SIGNAL_MSG: return SIGMSG;
#endif
#if defined (SIGSOUND)
case TARGET_SIGNAL_SOUND: return SIGSOUND;
#endif
#if defined (SIGSAK)
case TARGET_SIGNAL_SAK: return SIGSAK;
#endif
default:
/* The user might be trying to do "signal SIGSAK" where this system
doesn't have SIGSAK. */
warning ("Signal %s does not exist on this system.\n",
target_signal_to_name (oursig));
return 0;
}
}
/* Helper function for child_wait and the Lynx derivatives of child_wait.
HOSTSTATUS is the waitstatus from wait() or the equivalent; store our
translation of that in OURSTATUS. */
void
store_waitstatus (ourstatus, hoststatus)
struct target_waitstatus *ourstatus;
int hoststatus;
{
if (WIFEXITED (hoststatus))
{
ourstatus->kind = TARGET_WAITKIND_EXITED;
ourstatus->value.integer = WEXITSTATUS (hoststatus);
}
else if (!WIFSTOPPED (hoststatus))
{
ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
ourstatus->value.sig = target_signal_from_host (WTERMSIG (hoststatus));
}
else
{
ourstatus->kind = TARGET_WAITKIND_STOPPED;
ourstatus->value.sig = target_signal_from_host (WSTOPSIG (hoststatus));
}
}
#ifndef CHILD_WAIT
/* Wait for child to do something. Return pid of child, or -1 in case
@ -405,9 +81,13 @@ child_wait (pid, ourstatus)
if (attach_flag)
set_sigint_trap(); /* Causes SIGINT to be passed on to the
attached process. */
set_sigio_trap ();
pid = wait (&status);
save_errno = errno;
clear_sigio_trap ();
if (attach_flag)
clear_sigint_trap();
@ -580,7 +260,7 @@ child_create_inferior (exec_file, allargs, env)
char *allargs;
char **env;
{
fork_inferior (exec_file, allargs, env, ptrace_me, ptrace_him);
fork_inferior (exec_file, allargs, env, ptrace_me, ptrace_him, NULL);
/* We are at the first instruction we care about. */
/* Pedal to the metal... */
proceed ((CORE_ADDR) -1, TARGET_SIGNAL_0, 0);

2
gdb/procfs.c
View File

@ -573,6 +573,7 @@ wait_fd ()
if (attach_flag)
set_sigint_trap (); /* Causes SIGINT to be passed on to the
attached process. */
set_sigio_trap ();
#ifndef LOSING_POLL
num_fds = poll (poll_list, num_poll_list, -1);
@ -592,6 +593,7 @@ wait_fd ()
if (attach_flag)
clear_sigint_trap();
clear_sigio_trap ();
#ifndef LOSING_POLL

Write Preview
Loading…
Cancel
Save