2090129c36
This is the most important (and the biggest, sorry) patch of the series. It moves fork_inferior from gdb/fork-child.c to nat/fork-inferior.c and makes all the necessary adjustments to both GDB and gdbserver to make sure everything works OK. There is no "most important change" with this patch; all changes are made in a progressive way, making sure that gdbserver had the necessary features while not breaking GDB at the same time. I decided to go ahead and implement a partial support for starting the inferior with a shell on gdbserver, although the full feature comes in the next patch. The user won't have the option to disable the startup-with-shell, and also won't be able to change which shell gdbserver will use (other than setting the $SHELL environment variable, that is). Everything is working as expected, and no regressions were present during the tests. gdb/ChangeLog: 2017-06-07 Sergio Durigan Junior <sergiodj@redhat.com> Pedro Alves <palves@redhat.com> * Makefile.in (HFILES_NO_SRCDIR): Add "common/common-inferior.h" and "nat/fork-inferior.h". * common/common-inferior.h: New file, with contents from "gdb/inferior.h". * commom/common-utils.c: Include "common-utils.h". (stringify_argv): New function. * common/common-utils.h (stringify_argv): New prototype. * configure.nat: Add "fork-inferior.o" as a dependency for "*linux*", "fbsd*" and "nbsd*" hosts. * corefile.c (get_exec_file): Update comment. * darwin-nat.c (darwin_ptrace_him): Call "gdb_startup_inferior" instead of "startup_inferior". (darwin_create_inferior): Call "add_thread_silent" after "fork_inferior". * fork-child.c: Cleanup unnecessary includes. (SHELL_FILE): Move to "common/common-fork-child.c". (environ): Likewise. (exec_wrapper): Initialize. (get_exec_wrapper): New function. (breakup_args): Move to "common/common-fork-child.c"; rename to "breakup_args_for_exec". (escape_bang_in_quoted_argument): Move to "common/common-fork-child.c". (saved_ui): New variable. (prefork_hook): New function. (postfork_hook): Likewise. (postfork_child_hook): Likewise. (gdb_startup_inferior): Likewise. (fork_inferior): Move to "common/common-fork-child.c". Update function to support gdbserver. (startup_inferior): Likewise. * gdbcore.h (get_exec_file): Remove declaration. * gnu-nat.c (gnu_create_inferior): Call "gdb_startup_inferior" instead of "startup_inferior". Call "add_thread_silent" after "fork_inferior". * inf-ptrace.c: Include "nat/fork-inferior.h" and "utils.h". (inf_ptrace_create_inferior): Call "gdb_startup_inferior" instead of "startup_inferior". Call "add_thread_silent" after "fork_inferior". * inferior.h: Include "common-inferior.h". (trace_start_error): Move to "common/common-utils.h". (trace_start_error_with_name): Likewise. (fork_inferior): Move prototype to "nat/fork-inferior.h". (startup_inferior): Likewise. (gdb_startup_inferior): New prototype. * nat/fork-inferior.c: New file, with contents from "fork-child.c". * nat/fork-inferior.h: New file. * procfs.c (procfs_init_inferior): Call "gdb_startup_inferior" instead of "startup_inferior". Call "add_thread_silent" after "fork_inferior". * target.h (target_terminal_init): Move prototype to "target/target.h". (target_terminal_inferior): Likewise. (target_terminal_ours): Likewise. * target/target.h (target_terminal_init): New prototype, moved from "target.h". (target_terminal_inferior): Likewise. (target_terminal_ours): Likewise. * utils.c (gdb_flush_out_err): New function. gdb/gdbserver/ChangeLog: 2017-06-07 Sergio Durigan Junior <sergiodj@redhat.com> Pedro Alves <palves@redhat.com> * Makefile.in (SFILES): Add "nat/fork-inferior.o". * configure: Regenerate. * configure.srv (srv_linux_obj): Add "fork-child.o" and "fork-inferior.o". (i[34567]86-*-lynxos*): Likewise. (spu*-*-*): Likewise. * fork-child.c: New file. * linux-low.c: Include "common-inferior.h", "nat/fork-inferior.h" and "environ.h". (linux_ptrace_fun): New function. (linux_create_inferior): Adjust function prototype to reflect change on "target.h". Adjust function code to use "fork_inferior". (linux_request_interrupt): Delete "signal_pid". * lynx-low.c: Include "common-inferior.h" and "nat/fork-inferior.h". (lynx_ptrace_fun): New function. (lynx_create_inferior): Adjust function prototype to reflect change on "target.h". Adjust function code to use "fork_inferior". * nto-low.c (nto_create_inferior): Adjust function prototype and code to reflect change on "target.h". Update comments. * server.c: Include "common-inferior.h", "nat/fork-inferior.h", "common-terminal.h" and "environ.h". (terminal_fd): Moved to fork-child.c. (old_foreground_pgrp): Likewise. (restore_old_foreground_pgrp): Likewise. (last_status): Make it global. (last_ptid): Likewise. (our_environ): New variable. (startup_with_shell): Likewise. (program_name): Likewise. (program_argv): Rename to... (program_args): ...this. (wrapper_argv): New variable. (start_inferior): Delete function. (get_exec_wrapper): New function. (get_exec_file): Likewise. (get_environ): Likewise. (prefork_hook): Likewise. (post_fork_inferior): Likewise. (postfork_hook): Likewise. (postfork_child_hook): Likewise. (handle_v_run): Update code to deal with arguments coming from the remote host. Update calls from "start_inferior" to "create_inferior". (captured_main): Likewise. Initialize environment variable. Call "have_job_control". * server.h (post_fork_inferior): New prototype. (get_environ): Likewise. (last_status): Declare. (last_ptid): Likewise. (signal_pid): Likewise. * spu-low.c: Include "common-inferior.h" and "nat/fork-inferior.h". (spu_ptrace_fun): New function. (spu_create_inferior): Adjust function prototype to reflect change on "target.h". Adjust function code to use "fork_inferior". * target.c (target_terminal_init): New function. (target_terminal_inferior): Likewise. (target_terminal_ours): Likewise. * target.h: Include <vector>. (struct target_ops) <create_inferior>: Update prototype. (create_inferior): Update macro. * utils.c (gdb_flush_out_err): New function. * win32-low.c (win32_create_inferior): Adjust function prototype and code to reflect change on "target.h". gdb/testsuite/ChangeLog: 2017-06-07 Sergio Durigan Junior <sergiodj@redhat.com> * gdb.server/non-existing-program.exp: Update regex in order to reflect the fact that gdbserver is now using fork_inferior (with a shell) to startup the inferior.
236 lines
8.0 KiB
C
236 lines
8.0 KiB
C
/* Machine independent variables that describe the core file under GDB.
|
||
|
||
Copyright (C) 1986-2017 Free Software Foundation, Inc.
|
||
|
||
This file is part of GDB.
|
||
|
||
This program is free software; you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation; either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
This program is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
/* Interface routines for core, executable, etc. */
|
||
|
||
#if !defined (GDBCORE_H)
|
||
#define GDBCORE_H 1
|
||
|
||
struct type;
|
||
struct regcache;
|
||
|
||
#include "bfd.h"
|
||
#include "exec.h"
|
||
#include "target.h"
|
||
|
||
/* Nonzero if there is a core file. */
|
||
|
||
extern int have_core_file_p (void);
|
||
|
||
/* Report a memory error with error(). */
|
||
|
||
extern void memory_error (enum target_xfer_status status, CORE_ADDR memaddr);
|
||
|
||
/* The string 'memory_error' would use as exception message. Space
|
||
for the result is malloc'd, caller must free. */
|
||
|
||
extern char *memory_error_message (enum target_xfer_status err,
|
||
struct gdbarch *gdbarch, CORE_ADDR memaddr);
|
||
|
||
/* Like target_read_memory, but report an error if can't read. */
|
||
|
||
extern void read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len);
|
||
|
||
/* Like target_read_stack, but report an error if can't read. */
|
||
|
||
extern void read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len);
|
||
|
||
/* Like target_read_code, but report an error if can't read. */
|
||
|
||
extern void read_code (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len);
|
||
|
||
/* Read an integer from debugged memory, given address and number of
|
||
bytes. */
|
||
|
||
extern LONGEST read_memory_integer (CORE_ADDR memaddr,
|
||
int len, enum bfd_endian byte_order);
|
||
extern int safe_read_memory_integer (CORE_ADDR memaddr, int len,
|
||
enum bfd_endian byte_order,
|
||
LONGEST *return_value);
|
||
|
||
/* Read an unsigned integer from debugged memory, given address and
|
||
number of bytes. */
|
||
|
||
extern ULONGEST read_memory_unsigned_integer (CORE_ADDR memaddr,
|
||
int len,
|
||
enum bfd_endian byte_order);
|
||
extern int safe_read_memory_unsigned_integer (CORE_ADDR memaddr, int len,
|
||
enum bfd_endian byte_order,
|
||
ULONGEST *return_value);
|
||
|
||
/* Read an integer from debugged code memory, given address,
|
||
number of bytes, and byte order for code. */
|
||
|
||
extern LONGEST read_code_integer (CORE_ADDR memaddr, int len,
|
||
enum bfd_endian byte_order);
|
||
|
||
/* Read an unsigned integer from debugged code memory, given address,
|
||
number of bytes, and byte order for code. */
|
||
|
||
extern ULONGEST read_code_unsigned_integer (CORE_ADDR memaddr,
|
||
int len,
|
||
enum bfd_endian byte_order);
|
||
|
||
/* Read a null-terminated string from the debuggee's memory, given
|
||
address, a buffer into which to place the string, and the maximum
|
||
available space. */
|
||
|
||
extern void read_memory_string (CORE_ADDR, char *, int);
|
||
|
||
/* Read the pointer of type TYPE at ADDR, and return the address it
|
||
represents. */
|
||
|
||
CORE_ADDR read_memory_typed_address (CORE_ADDR addr, struct type *type);
|
||
|
||
/* Same as target_write_memory, but report an error if can't
|
||
write. */
|
||
|
||
extern void write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr,
|
||
ssize_t len);
|
||
|
||
/* Same as write_memory, but notify 'memory_changed' observers. */
|
||
|
||
extern void write_memory_with_notification (CORE_ADDR memaddr,
|
||
const bfd_byte *myaddr,
|
||
ssize_t len);
|
||
|
||
/* Store VALUE at ADDR in the inferior as a LEN-byte unsigned integer. */
|
||
extern void write_memory_unsigned_integer (CORE_ADDR addr, int len,
|
||
enum bfd_endian byte_order,
|
||
ULONGEST value);
|
||
|
||
/* Store VALUE at ADDR in the inferior as a LEN-byte unsigned integer. */
|
||
extern void write_memory_signed_integer (CORE_ADDR addr, int len,
|
||
enum bfd_endian byte_order,
|
||
LONGEST value);
|
||
|
||
/* Hook for `exec_file_command' command to call. */
|
||
|
||
extern void (*deprecated_exec_file_display_hook) (const char *filename);
|
||
|
||
/* Hook for "file_command", which is more useful than above
|
||
(because it is invoked AFTER symbols are read, not before). */
|
||
|
||
extern void (*deprecated_file_changed_hook) (char *filename);
|
||
|
||
extern void specify_exec_file_hook (void (*hook) (const char *filename));
|
||
|
||
/* Binary File Diddler for the core file. */
|
||
|
||
extern bfd *core_bfd;
|
||
|
||
extern struct target_ops *core_target;
|
||
|
||
/* Whether to open exec and core files read-only or read-write. */
|
||
|
||
extern int write_files;
|
||
|
||
extern void core_file_command (char *filename, int from_tty);
|
||
|
||
extern void exec_file_attach (const char *filename, int from_tty);
|
||
|
||
/* If the filename of the main executable is unknown, attempt to
|
||
determine it. If a filename is determined, proceed as though
|
||
it was just specified with the "file" command. Do nothing if
|
||
the filename of the main executable is already known.
|
||
DEFER_BP_RESET uses SYMFILE_DEFER_BP_RESET for the main symbol file. */
|
||
|
||
extern void exec_file_locate_attach (int pid, int defer_bp_reset, int from_tty);
|
||
|
||
extern void exec_file_clear (int from_tty);
|
||
|
||
extern void validate_files (void);
|
||
|
||
/* The current default bfd target. */
|
||
|
||
extern char *gnutarget;
|
||
|
||
extern void set_gnutarget (const char *);
|
||
|
||
/* Structure to keep track of core register reading functions for
|
||
various core file types. */
|
||
|
||
struct core_fns
|
||
{
|
||
|
||
/* BFD flavour that a core file handler is prepared to read. This
|
||
can be used by the handler's core tasting function as a first
|
||
level filter to reject BFD's that don't have the right
|
||
flavour. */
|
||
|
||
enum bfd_flavour core_flavour;
|
||
|
||
/* Core file handler function to call to recognize corefile
|
||
formats that BFD rejects. Some core file format just don't fit
|
||
into the BFD model, or may require other resources to identify
|
||
them, that simply aren't available to BFD (such as symbols from
|
||
another file). Returns nonzero if the handler recognizes the
|
||
format, zero otherwise. */
|
||
|
||
int (*check_format) (bfd *);
|
||
|
||
/* Core file handler function to call to ask if it can handle a
|
||
given core file format or not. Returns zero if it can't,
|
||
nonzero otherwise. */
|
||
|
||
int (*core_sniffer) (struct core_fns *, bfd *);
|
||
|
||
/* Extract the register values out of the core file and supply them
|
||
into REGCACHE.
|
||
|
||
CORE_REG_SECT points to the register values themselves, read into
|
||
memory.
|
||
|
||
CORE_REG_SIZE is the size of that area.
|
||
|
||
WHICH says which set of registers we are handling:
|
||
0 --- integer registers
|
||
2 --- floating-point registers, on machines where they are
|
||
discontiguous
|
||
3 --- extended floating-point registers, on machines where
|
||
these are present in yet a third area. (GNU/Linux uses
|
||
this to get at the SSE registers.)
|
||
|
||
REG_ADDR is the offset from u.u_ar0 to the register values relative to
|
||
core_reg_sect. This is used with old-fashioned core files to locate the
|
||
registers in a large upage-plus-stack ".reg" section. Original upage
|
||
address X is at location core_reg_sect+x+reg_addr. */
|
||
|
||
void (*core_read_registers) (struct regcache *regcache,
|
||
char *core_reg_sect,
|
||
unsigned core_reg_size,
|
||
int which, CORE_ADDR reg_addr);
|
||
|
||
/* Finds the next struct core_fns. They are allocated and
|
||
initialized in whatever module implements the functions pointed
|
||
to; an initializer calls deprecated_add_core_fns to add them to
|
||
the global chain. */
|
||
|
||
struct core_fns *next;
|
||
|
||
};
|
||
|
||
/* NOTE: cagney/2004-04-05: Replaced by "regset.h" and
|
||
regset_from_core_section(). */
|
||
extern void deprecated_add_core_fns (struct core_fns *cf);
|
||
extern int default_core_sniffer (struct core_fns *cf, bfd * abfd);
|
||
extern int default_check_format (bfd * abfd);
|
||
|
||
#endif /* !defined (GDBCORE_H) */
|