X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Finf-child.c;h=897e63597243b46b97d2a68ebdd1e2b3124acc97;hb=b67a2c6fd4862b79c04c254fe2ba37c180b73d60;hp=eb7550a9c6544b08aeae33ee4547a5c945460080;hpb=dbbca37d38772f0f75296b01b757225278eb51fc;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/inf-child.c b/gdb/inf-child.c
index eb7550a9c6..897e635972 100644
--- a/gdb/inf-child.c
+++ b/gdb/inf-child.c
@@ -1,5 +1,4 @@
-/* Default child (native) target interface, for GDB when running under
- Unix.
+/* Base/prototype target for default child (native) targets.
Copyright (C) 1988-2014 Free Software Foundation, Inc.
@@ -18,6 +17,11 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
+/* This file provides a common base class/target that all native
+ target implementations extend, by calling inf_child_target to get a
+ new prototype target and then overriding target methods as
+ necessary. */
+
#include "defs.h"
#include "regcache.h"
#include "memattr.h"
@@ -36,6 +40,11 @@
#include
#include
+/* A pointer to what is returned by inf_child_target. Used by
+ inf_child_open to push the most-derived target in reaction to
+ "target native". */
+static struct target_ops *inf_child_ops = NULL;
+
/* 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. */
@@ -89,8 +98,8 @@ inf_child_store_inferior_registers (struct target_ops *ops,
static void
inf_child_post_attach (struct target_ops *self, int pid)
{
- /* This version of Unix doesn't require a meaningful "post attach"
- operation by a debugger. */
+ /* This target doesn't require a meaningful "post attach" operation
+ by a debugger. */
}
/* Get ready to modify the registers array. On machines which store
@@ -105,25 +114,79 @@ inf_child_prepare_to_store (struct target_ops *self,
{
}
+/* True if the user did "target native". In that case, we won't
+ unpush the child target automatically when the last inferior is
+ gone. */
+static int inf_child_explicitly_opened;
+
+/* See inf-child.h. */
+
+void
+inf_child_open_target (struct target_ops *target, char *arg, int from_tty)
+{
+ target_preopen (from_tty);
+ push_target (target);
+ inf_child_explicitly_opened = 1;
+ if (from_tty)
+ printf_filtered ("Done. Use the \"run\" command to start a process.\n");
+}
+
static void
inf_child_open (char *arg, int from_tty)
{
- error (_("Use the \"run\" command to start a Unix child process."));
+ inf_child_open_target (inf_child_ops, arg, from_tty);
+}
+
+/* Implement the to_disconnect target_ops method. */
+
+static void
+inf_child_disconnect (struct target_ops *target, const char *args, int from_tty)
+{
+ if (args != NULL)
+ error (_("Argument given to \"disconnect\"."));
+
+ /* This offers to detach/kill current inferiors, and then pops all
+ targets. */
+ target_preopen (from_tty);
+}
+
+/* Implement the to_close target_ops method. */
+
+static void
+inf_child_close (struct target_ops *target)
+{
+ /* In case we were forcibly closed. */
+ inf_child_explicitly_opened = 0;
+}
+
+void
+inf_child_mourn_inferior (struct target_ops *ops)
+{
+ generic_mourn_inferior ();
+ inf_child_maybe_unpush_target (ops);
+}
+
+/* See inf-child.h. */
+
+void
+inf_child_maybe_unpush_target (struct target_ops *ops)
+{
+ if (!inf_child_explicitly_opened && !have_inferiors ())
+ unpush_target (ops);
}
static void
inf_child_post_startup_inferior (struct target_ops *self, ptid_t ptid)
{
- /* This version of Unix doesn't require a meaningful "post startup
- inferior" operation by a debugger. */
+ /* This target doesn't require a meaningful "post startup inferior"
+ operation by a debugger. */
}
static int
inf_child_follow_fork (struct target_ops *ops, int follow_child,
int detach_fork)
{
- /* This version of Unix doesn't support following fork or vfork
- events. */
+ /* This target doesn't support following fork or vfork events. */
return 0;
}
@@ -136,8 +199,8 @@ inf_child_can_run (struct target_ops *self)
static char *
inf_child_pid_to_exec_file (struct target_ops *self, int pid)
{
- /* This version of Unix doesn't support translation of a process ID
- to the filename of the executable file. */
+ /* This target doesn't support translation of a process ID to the
+ filename of the executable file. */
return NULL;
}
@@ -344,7 +407,8 @@ inf_child_fileio_unlink (struct target_ops *self,
null-terminated string allocated via xmalloc, or NULL if an error
occurs (and set *TARGET_ERRNO). */
static char *
-inf_child_fileio_readlink (const char *filename, int *target_errno)
+inf_child_fileio_readlink (struct target_ops *self,
+ const char *filename, int *target_errno)
{
/* We support readlink only on systems that also provide a compile-time
maximum path length (PATH_MAX), at least for now. */
@@ -371,7 +435,7 @@ inf_child_fileio_readlink (const char *filename, int *target_errno)
}
static int
-inf_child_use_agent (int use)
+inf_child_use_agent (struct target_ops *self, int use)
{
if (agent_loaded_p ())
{
@@ -383,35 +447,50 @@ inf_child_use_agent (int use)
}
static int
-inf_child_can_use_agent (void)
+inf_child_can_use_agent (struct target_ops *self)
{
return agent_loaded_p ();
}
+/* Default implementation of the to_can_async_p and
+ to_supports_non_stop methods. */
+
+static int
+return_zero (struct target_ops *ignore)
+{
+ return 0;
+}
+
struct target_ops *
inf_child_target (void)
{
struct target_ops *t = XCNEW (struct target_ops);
- t->to_shortname = "child";
- t->to_longname = "Unix child process";
- t->to_doc = "Unix child process (started by the \"run\" command).";
+ t->to_shortname = "native";
+ t->to_longname = "Native process";
+ t->to_doc = "Native process (started by the \"run\" command).";
t->to_open = inf_child_open;
+ t->to_close = inf_child_close;
+ t->to_disconnect = inf_child_disconnect;
t->to_post_attach = inf_child_post_attach;
t->to_fetch_registers = inf_child_fetch_inferior_registers;
t->to_store_registers = inf_child_store_inferior_registers;
t->to_prepare_to_store = inf_child_prepare_to_store;
t->to_insert_breakpoint = memory_insert_breakpoint;
t->to_remove_breakpoint = memory_remove_breakpoint;
- t->to_terminal_init = terminal_init_inferior;
- t->to_terminal_inferior = terminal_inferior;
- t->to_terminal_ours_for_output = terminal_ours_for_output;
- t->to_terminal_save_ours = terminal_save_ours;
- t->to_terminal_ours = terminal_ours;
+ t->to_terminal_init = child_terminal_init;
+ t->to_terminal_inferior = child_terminal_inferior;
+ t->to_terminal_ours_for_output = child_terminal_ours_for_output;
+ t->to_terminal_save_ours = child_terminal_save_ours;
+ t->to_terminal_ours = child_terminal_ours;
t->to_terminal_info = child_terminal_info;
t->to_post_startup_inferior = inf_child_post_startup_inferior;
t->to_follow_fork = inf_child_follow_fork;
t->to_can_run = inf_child_can_run;
+ /* We must default these because they must be implemented by any
+ target that can run. */
+ t->to_can_async_p = return_zero;
+ t->to_supports_non_stop = return_zero;
t->to_pid_to_exec_file = inf_child_pid_to_exec_file;
t->to_stratum = process_stratum;
t->to_has_all_memory = default_child_has_all_memory;
@@ -428,5 +507,10 @@ inf_child_target (void)
t->to_magic = OPS_MAGIC;
t->to_use_agent = inf_child_use_agent;
t->to_can_use_agent = inf_child_can_use_agent;
+
+ /* Store a pointer so we can push the most-derived target from
+ inf_child_open. */
+ inf_child_ops = t;
+
return t;
}