/* Target-vector operations for controlling Unix child processes, for GDB.
- Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
- 2000, 2002
- Free Software Foundation, Inc.
+
+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
+ 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+
Contributed by Cygnus Support.
## Contains temporary hacks..
#include <fcntl.h>
#include "gdb_wait.h"
+#include "inflow.h"
extern struct symtab_and_line *child_enable_exception_callback (enum
exception_event_kind,
static void child_detach (char *, int);
-static void child_detach_from_process (int, char *, int, int);
-
static void child_attach (char *, int);
-static void child_attach_to_process (char *, int, int);
-
#if !defined(CHILD_POST_ATTACH)
extern void child_post_attach (int);
#endif
-static void child_require_attach (char *, int);
-
-static void child_require_detach (int, char *, int);
-
static void ptrace_me (void);
static void ptrace_him (int);
#endif
+/* Attach to process PID, then initialize for debugging it. */
+
static void
-child_attach_to_process (char *args, int from_tty, int after_fork)
+child_attach (char *args, int from_tty)
{
if (!args)
error_no_arg ("process-id to attach");
{
exec_file = (char *) get_exec_file (0);
- if (after_fork)
- printf_unfiltered ("Attaching after fork to %s\n",
- target_pid_to_str (pid_to_ptid (pid)));
- else if (exec_file)
+ if (exec_file)
printf_unfiltered ("Attaching to program: %s, %s\n", exec_file,
target_pid_to_str (pid_to_ptid (pid)));
else
- printf_unfiltered ("Attaching to %s\n",
+ printf_unfiltered ("Attaching to %s\n",
target_pid_to_str (pid_to_ptid (pid)));
gdb_flush (gdb_stdout);
}
- if (!after_fork)
- attach (pid);
- else
- REQUIRE_ATTACH (pid);
+ attach (pid);
inferior_ptid = pid_to_ptid (pid);
push_target (&child_ops);
#endif /* ATTACH_DETACH */
}
-
-/* Attach to process PID, then initialize for debugging it. */
-
-static void
-child_attach (char *args, int from_tty)
-{
- child_attach_to_process (args, from_tty, 0);
-}
-
#if !defined(CHILD_POST_ATTACH)
void
child_post_attach (int pid)
}
#endif
-static void
-child_require_attach (char *args, int from_tty)
-{
- child_attach_to_process (args, from_tty, 1);
-}
+/* Take a program previously attached to and detaches it.
+ The program resumes execution and will no longer stop
+ on signals, etc. We'd better not have left any breakpoints
+ in the program or it'll die when it hits one. For this
+ to work, it may be necessary for the process to have been
+ previously attached. It *might* work if the program was
+ started via the normal ptrace (PTRACE_TRACEME). */
static void
-child_detach_from_process (int pid, char *args, int from_tty, int after_fork)
+child_detach (char *args, int from_tty)
{
#ifdef ATTACH_DETACH
{
int siggnal = 0;
+ int pid = PIDGET (inferior_ptid);
if (from_tty)
{
char *exec_file = get_exec_file (0);
if (exec_file == 0)
exec_file = "";
- if (after_fork)
- printf_unfiltered ("Detaching after fork from %s\n",
- target_pid_to_str (pid_to_ptid (pid)));
- else
- printf_unfiltered ("Detaching from program: %s, %s\n", exec_file,
- target_pid_to_str (pid_to_ptid (pid)));
+ printf_unfiltered ("Detaching from program: %s, %s\n", exec_file,
+ target_pid_to_str (pid_to_ptid (pid)));
gdb_flush (gdb_stdout);
}
if (args)
siggnal = atoi (args);
- if (!after_fork)
- detach (siggnal);
- else
- REQUIRE_DETACH (pid, siggnal);
+ detach (siggnal);
+
+ inferior_ptid = null_ptid;
+ unpush_target (&child_ops);
}
#else
error ("This version of Unix does not support detaching a process.");
#endif
}
-/* Take a program previously attached to and detaches it.
- The program resumes execution and will no longer stop
- on signals, etc. We'd better not have left any breakpoints
- in the program or it'll die when it hits one. For this
- to work, it may be necessary for the process to have been
- previously attached. It *might* work if the program was
- started via the normal ptrace (PTRACE_TRACEME). */
-
-static void
-child_detach (char *args, int from_tty)
-{
- child_detach_from_process (PIDGET (inferior_ptid), args, from_tty, 0);
- inferior_ptid = null_ptid;
- unpush_target (&child_ops);
-}
-
-static void
-child_require_detach (int pid, char *args, int from_tty)
-{
- child_detach_from_process (pid, args, from_tty, 1);
-}
-
-
/* Get ready to modify the registers array. On machines which store
individual registers, this doesn't need to do anything. On machines
which store all the registers in one fell swoop, this makes sure
attach_flag ? "attached" : "child", target_pid_to_str (inferior_ptid));
}
-/* ARGSUSED */
static void
child_open (char *arg, int from_tty)
{
static void
child_stop (void)
{
- extern pid_t inferior_process_group;
-
kill (-inferior_process_group, SIGINT);
}
*/
return NULL;
}
-\f
+
+/* Perform a partial transfer to/from the specified object. For
+ memory transfers, fall back to the old memory xfer functions. */
+
+static LONGEST
+child_xfer_partial (struct target_ops *ops, enum target_object object,
+ const char *annex, void *readbuf,
+ const void *writebuf, ULONGEST offset, LONGEST len)
+{
+ switch (object)
+ {
+ case TARGET_OBJECT_MEMORY:
+ if (readbuf)
+ return child_xfer_memory (offset, readbuf, len, 0/*write*/,
+ NULL, ops);
+ if (writebuf)
+ return child_xfer_memory (offset, readbuf, len, 1/*write*/,
+ NULL, ops);
+ return -1;
+
+ case TARGET_OBJECT_UNWIND_TABLE:
+#ifndef NATIVE_XFER_UNWIND_TABLE
+#define NATIVE_XFER_UNWIND_TABLE(OPS,OBJECT,ANNEX,WRITEBUF,READBUF,OFFSET,LEN) (-1)
+#endif
+ return NATIVE_XFER_UNWIND_TABLE (ops, object, annex, readbuf, writebuf,
+ offset, len);
+
+ case TARGET_OBJECT_AUXV:
+#ifndef NATIVE_XFER_AUXV
+#define NATIVE_XFER_AUXV(OPS,OBJECT,ANNEX,WRITEBUF,READBUF,OFFSET,LEN) (-1)
+#endif
+ return NATIVE_XFER_AUXV (ops, object, annex, readbuf, writebuf,
+ offset, len);
+
+ case TARGET_OBJECT_WCOOKIE:
+#ifndef NATIVE_XFER_WCOOKIE
+#define NATIVE_XFER_WCOOKIE(OPS,OBJECT,ANNEX,WRITEBUF,READBUF,OFFSET,LEN) (-1)
+#endif
+ return NATIVE_XFER_WCOOKIE (ops, object, annex, readbuf, writebuf,
+ offset, len);
+
+ default:
+ return -1;
+ }
+}
#if !defined(CHILD_PID_TO_STR)
char *
child_ops.to_open = child_open;
child_ops.to_attach = child_attach;
child_ops.to_post_attach = child_post_attach;
- child_ops.to_require_attach = child_require_attach;
child_ops.to_detach = child_detach;
- child_ops.to_require_detach = child_require_detach;
child_ops.to_resume = child_resume;
child_ops.to_wait = child_wait;
child_ops.to_post_wait = child_post_wait;
child_ops.to_store_registers = store_inferior_registers;
child_ops.to_prepare_to_store = child_prepare_to_store;
child_ops.to_xfer_memory = child_xfer_memory;
+ child_ops.to_xfer_partial = child_xfer_partial;
child_ops.to_files_info = child_files_info;
child_ops.to_insert_breakpoint = memory_insert_breakpoint;
child_ops.to_remove_breakpoint = memory_remove_breakpoint;
}
/* Take over the 'find_mapped_memory' vector from inftarg.c. */
-extern void
-inftarg_set_find_memory_regions (int (*func) (int (*) (CORE_ADDR,
- unsigned long,
- int, int, int,
+extern void
+inftarg_set_find_memory_regions (int (*func) (int (*) (CORE_ADDR,
+ unsigned long,
+ int, int, int,
void *),
void *))
{
}
/* Take over the 'make_corefile_notes' vector from inftarg.c. */
-extern void
+extern void
inftarg_set_make_corefile_notes (char * (*func) (bfd *, int *))
{
child_ops.to_make_corefile_notes = func;
#define PROC_NAME_FMT "/proc/%05d"
#endif
sprintf (procname, PROC_NAME_FMT, getpid ());
- if ((fd = open (procname, O_RDONLY)) >= 0)
+ fd = open (procname, O_RDONLY);
+ if (fd >= 0)
{
close (fd);
return;
projects / deliverable / binutils-gdb.git / blobdiff