OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2012-05-22 Pedro Alves <palves@redhat.com> 

* target.h (store_waitstatus): Move declaration ...
	* inf-child.h (store_waitstatus): ... here.
	* target.c: Move inclusion of gdb_wait.h, and ...
	(store_waitstatus): ... this ...
	* inf-child.c: ... here.
	* linux-nat.c: Include inf-child.h.
	* rs6000-nat.c: Include inf-child.h.
	* spu-linux-nat.c: Include inf-child.h.
This commit is contained in:
Pedro Alves 2012-05-22 15:04:57 +00:00
parent 7e01508c91
commit dab06dbee5
8 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -1,3 +1,14 @@
2012-05-22 Pedro Alves <palves@redhat.com>
* target.h (store_waitstatus): Move declaration ...
* inf-child.h (store_waitstatus): ... here.
* target.c: Move inclusion of gdb_wait.h, and ...
(store_waitstatus): ... this ...
* inf-child.c: ... here.
* linux-nat.c: Include inf-child.h.
* rs6000-nat.c: Include inf-child.h.
* spu-linux-nat.c: Include inf-child.h.
2012-05-22 Pierre Muller <muller@ics.u-strasbg.fr>
* tracepoint.c (start_tracing): Add missing i18n markup.

24
gdb/inf-child.c
View File

@ -30,6 +30,7 @@
#include "inf-child.h"
#include "gdb/fileio.h"
#include "agent.h"
#include "gdb_wait.h"
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> /* for MAXPATHLEN */
@ -38,6 +39,29 @@
#include <fcntl.h>
#include <unistd.h>
/* Helper function for child_wait and the derivatives of child_wait.
HOSTSTATUS is the waitstatus from wait() or the equivalent; store our
translation of that in OURSTATUS. */
void
store_waitstatus (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));
}
}
/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this
for all registers. */

5
gdb/inf-child.h
View File

@ -25,4 +25,9 @@
extern struct target_ops *inf_child_target (void);
/* Functions for helping to write a native target. */
/* This is for native targets which use a unix/POSIX-style waitstatus. */
extern void store_waitstatus (struct target_waitstatus *, int);
#endif

1
gdb/linux-nat.c
View File

@ -36,6 +36,7 @@
#include "gdbcmd.h"
#include "regcache.h"
#include "regset.h"
#include "inf-child.h"
#include "inf-ptrace.h"
#include "auxv.h"
#include <sys/param.h> /* for MAXPATHLEN */

1
gdb/rs6000-nat.c
View File

@ -31,6 +31,7 @@
#include "gdb-stabs.h"
#include "regcache.h"
#include "arch-utils.h"
#include "inf-child.h"
#include "inf-ptrace.h"
#include "ppc-tdep.h"
#include "rs6000-tdep.h"

1
gdb/spu-linux-nat.c
View File

@ -23,6 +23,7 @@
#include "gdb_string.h"
#include "target.h"
#include "inferior.h"
#include "inf-child.h"
#include "inf-ptrace.h"
#include "regcache.h"
#include "symfile.h"

24
gdb/target.c
View File

@ -29,7 +29,6 @@
#include "bfd.h"
#include "symfile.h"
#include "objfiles.h"
#include "gdb_wait.h"
#include "dcache.h"
#include <signal.h>
#include "regcache.h"
@ -3650,29 +3649,6 @@ generic_mourn_inferior (void)
deprecated_detach_hook ();
}
/* Helper function for child_wait and the derivatives of child_wait.
HOSTSTATUS is the waitstatus from wait() or the equivalent; store our
translation of that in OURSTATUS. */
void
store_waitstatus (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));
}
}
/* Convert a normal process ID to a string. Returns the string in a
static buffer. */

4
gdb/target.h
View File

@ -1857,10 +1857,6 @@ extern int baud_rate;
extern int remote_timeout;
/* Functions for helping to write a native target. */
/* This is for native targets which use a unix/POSIX-style waitstatus. */
extern void store_waitstatus (struct target_waitstatus *, int);
/* Set the show memory breakpoints mode to show, and installs a cleanup
to restore it back to the current value. */