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.
355 lines
7.0 KiB
C
355 lines
7.0 KiB
C
/* Shared general utility routines for GDB, the GNU debugger.
|
|
|
|
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/>. */
|
|
|
|
#include "common-defs.h"
|
|
#include "common-utils.h"
|
|
#include "host-defs.h"
|
|
#include <ctype.h>
|
|
|
|
/* The xmalloc() (libiberty.h) family of memory management routines.
|
|
|
|
These are like the ISO-C malloc() family except that they implement
|
|
consistent semantics and guard against typical memory management
|
|
problems. */
|
|
|
|
/* NOTE: These are declared using PTR to ensure consistency with
|
|
"libiberty.h". xfree() is GDB local. */
|
|
|
|
PTR /* ARI: PTR */
|
|
xmalloc (size_t size)
|
|
{
|
|
void *val;
|
|
|
|
/* See libiberty/xmalloc.c. This function need's to match that's
|
|
semantics. It never returns NULL. */
|
|
if (size == 0)
|
|
size = 1;
|
|
|
|
val = malloc (size); /* ARI: malloc */
|
|
if (val == NULL)
|
|
malloc_failure (size);
|
|
|
|
return val;
|
|
}
|
|
|
|
PTR /* ARI: PTR */
|
|
xrealloc (PTR ptr, size_t size) /* ARI: PTR */
|
|
{
|
|
void *val;
|
|
|
|
/* See libiberty/xmalloc.c. This function need's to match that's
|
|
semantics. It never returns NULL. */
|
|
if (size == 0)
|
|
size = 1;
|
|
|
|
if (ptr != NULL)
|
|
val = realloc (ptr, size); /* ARI: realloc */
|
|
else
|
|
val = malloc (size); /* ARI: malloc */
|
|
if (val == NULL)
|
|
malloc_failure (size);
|
|
|
|
return val;
|
|
}
|
|
|
|
PTR /* ARI: PTR */
|
|
xcalloc (size_t number, size_t size)
|
|
{
|
|
void *mem;
|
|
|
|
/* See libiberty/xmalloc.c. This function need's to match that's
|
|
semantics. It never returns NULL. */
|
|
if (number == 0 || size == 0)
|
|
{
|
|
number = 1;
|
|
size = 1;
|
|
}
|
|
|
|
mem = calloc (number, size); /* ARI: xcalloc */
|
|
if (mem == NULL)
|
|
malloc_failure (number * size);
|
|
|
|
return mem;
|
|
}
|
|
|
|
void *
|
|
xzalloc (size_t size)
|
|
{
|
|
return xcalloc (1, size);
|
|
}
|
|
|
|
void
|
|
xfree (void *ptr)
|
|
{
|
|
if (ptr != NULL)
|
|
free (ptr); /* ARI: free */
|
|
}
|
|
|
|
void
|
|
xmalloc_failed (size_t size)
|
|
{
|
|
malloc_failure (size);
|
|
}
|
|
|
|
/* Like asprintf/vasprintf but get an internal_error if the call
|
|
fails. */
|
|
|
|
char *
|
|
xstrprintf (const char *format, ...)
|
|
{
|
|
char *ret;
|
|
va_list args;
|
|
|
|
va_start (args, format);
|
|
ret = xstrvprintf (format, args);
|
|
va_end (args);
|
|
return ret;
|
|
}
|
|
|
|
char *
|
|
xstrvprintf (const char *format, va_list ap)
|
|
{
|
|
char *ret = NULL;
|
|
int status = vasprintf (&ret, format, ap);
|
|
|
|
/* NULL is returned when there was a memory allocation problem, or
|
|
any other error (for instance, a bad format string). A negative
|
|
status (the printed length) with a non-NULL buffer should never
|
|
happen, but just to be sure. */
|
|
if (ret == NULL || status < 0)
|
|
internal_error (__FILE__, __LINE__, _("vasprintf call failed"));
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
xsnprintf (char *str, size_t size, const char *format, ...)
|
|
{
|
|
va_list args;
|
|
int ret;
|
|
|
|
va_start (args, format);
|
|
ret = vsnprintf (str, size, format, args);
|
|
gdb_assert (ret < size);
|
|
va_end (args);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* See documentation in common-utils.h. */
|
|
|
|
std::string
|
|
string_printf (const char* fmt, ...)
|
|
{
|
|
va_list vp;
|
|
int size;
|
|
|
|
va_start (vp, fmt);
|
|
size = vsnprintf (NULL, 0, fmt, vp);
|
|
va_end (vp);
|
|
|
|
std::string str (size, '\0');
|
|
|
|
/* C++11 and later guarantee std::string uses contiguous memory and
|
|
always includes the terminating '\0'. */
|
|
va_start (vp, fmt);
|
|
vsprintf (&str[0], fmt, vp);
|
|
va_end (vp);
|
|
|
|
return str;
|
|
}
|
|
|
|
char *
|
|
savestring (const char *ptr, size_t len)
|
|
{
|
|
char *p = (char *) xmalloc (len + 1);
|
|
|
|
memcpy (p, ptr, len);
|
|
p[len] = 0;
|
|
return p;
|
|
}
|
|
|
|
/* The bit offset of the highest byte in a ULONGEST, for overflow
|
|
checking. */
|
|
|
|
#define HIGH_BYTE_POSN ((sizeof (ULONGEST) - 1) * HOST_CHAR_BIT)
|
|
|
|
/* True (non-zero) iff DIGIT is a valid digit in radix BASE,
|
|
where 2 <= BASE <= 36. */
|
|
|
|
static int
|
|
is_digit_in_base (unsigned char digit, int base)
|
|
{
|
|
if (!isalnum (digit))
|
|
return 0;
|
|
if (base <= 10)
|
|
return (isdigit (digit) && digit < base + '0');
|
|
else
|
|
return (isdigit (digit) || tolower (digit) < base - 10 + 'a');
|
|
}
|
|
|
|
static int
|
|
digit_to_int (unsigned char c)
|
|
{
|
|
if (isdigit (c))
|
|
return c - '0';
|
|
else
|
|
return tolower (c) - 'a' + 10;
|
|
}
|
|
|
|
/* As for strtoul, but for ULONGEST results. */
|
|
|
|
ULONGEST
|
|
strtoulst (const char *num, const char **trailer, int base)
|
|
{
|
|
unsigned int high_part;
|
|
ULONGEST result;
|
|
int minus = 0;
|
|
int i = 0;
|
|
|
|
/* Skip leading whitespace. */
|
|
while (isspace (num[i]))
|
|
i++;
|
|
|
|
/* Handle prefixes. */
|
|
if (num[i] == '+')
|
|
i++;
|
|
else if (num[i] == '-')
|
|
{
|
|
minus = 1;
|
|
i++;
|
|
}
|
|
|
|
if (base == 0 || base == 16)
|
|
{
|
|
if (num[i] == '0' && (num[i + 1] == 'x' || num[i + 1] == 'X'))
|
|
{
|
|
i += 2;
|
|
if (base == 0)
|
|
base = 16;
|
|
}
|
|
}
|
|
|
|
if (base == 0 && num[i] == '0')
|
|
base = 8;
|
|
|
|
if (base == 0)
|
|
base = 10;
|
|
|
|
if (base < 2 || base > 36)
|
|
{
|
|
errno = EINVAL;
|
|
return 0;
|
|
}
|
|
|
|
result = high_part = 0;
|
|
for (; is_digit_in_base (num[i], base); i += 1)
|
|
{
|
|
result = result * base + digit_to_int (num[i]);
|
|
high_part = high_part * base + (unsigned int) (result >> HIGH_BYTE_POSN);
|
|
result &= ((ULONGEST) 1 << HIGH_BYTE_POSN) - 1;
|
|
if (high_part > 0xff)
|
|
{
|
|
errno = ERANGE;
|
|
result = ~ (ULONGEST) 0;
|
|
high_part = 0;
|
|
minus = 0;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (trailer != NULL)
|
|
*trailer = &num[i];
|
|
|
|
result = result + ((ULONGEST) high_part << HIGH_BYTE_POSN);
|
|
if (minus)
|
|
return -result;
|
|
else
|
|
return result;
|
|
}
|
|
|
|
/* See documentation in common-utils.h. */
|
|
|
|
char *
|
|
skip_spaces (char *chp)
|
|
{
|
|
if (chp == NULL)
|
|
return NULL;
|
|
while (*chp && isspace (*chp))
|
|
chp++;
|
|
return chp;
|
|
}
|
|
|
|
/* A const-correct version of the above. */
|
|
|
|
const char *
|
|
skip_spaces_const (const char *chp)
|
|
{
|
|
if (chp == NULL)
|
|
return NULL;
|
|
while (*chp && isspace (*chp))
|
|
chp++;
|
|
return chp;
|
|
}
|
|
|
|
/* See documentation in common-utils.h. */
|
|
|
|
const char *
|
|
skip_to_space_const (const char *chp)
|
|
{
|
|
if (chp == NULL)
|
|
return NULL;
|
|
while (*chp && !isspace (*chp))
|
|
chp++;
|
|
return chp;
|
|
}
|
|
|
|
/* See common/common-utils.h. */
|
|
|
|
void
|
|
free_vector_argv (std::vector<char *> &v)
|
|
{
|
|
for (char *el : v)
|
|
xfree (el);
|
|
|
|
v.clear ();
|
|
}
|
|
|
|
/* See common/common-utils.h. */
|
|
|
|
std::string
|
|
stringify_argv (const std::vector<char *> &args)
|
|
{
|
|
std::string ret;
|
|
|
|
if (!args.empty ())
|
|
{
|
|
for (auto s : args)
|
|
if (s != NULL)
|
|
{
|
|
ret += s;
|
|
ret += ' ';
|
|
}
|
|
|
|
/* Erase the last whitespace. */
|
|
ret.erase (ret.end () - 1);
|
|
}
|
|
|
|
return ret;
|
|
}
|