[02/58] gdbserver: turn target op 'create_inferior' into a method
Commit Message
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Make process_stratum_target's create_inferior op a method of
process_target.
* target.h (struct process_stratum_target): Remove the target op.
(class process_target): Add the target op.
(create_inferior): Rename the macro to ...
(target_create_inferior): ... this.
Update the derived structs and callers below.
* server.c (handle_v_run): Update.
(captured_main): Update.
(process_serial_event): Update.
* linux-low.c (linux_target_ops): Update.
(linux_create_inferior): Turn into ...
(linux_process_target::create_inferior): ... this.
* linux-low.h (class linux_process_target): Update.
* lynx-low.c (lynx_target_ops): Update.
(lynx_create_inferior): Turn into ...
(lynx_process_target::create_inferior): ... this.
* lynx-low.h (class lynx_process_target): Update.
* nto-low.c (nto_target_ops): Update.
(nto_create_inferior): Turn into ...
(nto_process_target::create_inferior): ... this.
* nto-low.h (class nto_process_target): Update.
* win32-low.c (win32_target_ops): Update.
(win32_create_inferior): Turn into ...
(win32_process_target::create_inferior): ... this.
* win32-low.h (class win32_process_target): Update.
---
gdbserver/linux-low.c | 7 +++----
gdbserver/linux-low.h | 2 ++
gdbserver/lynx-low.c | 7 +++----
gdbserver/lynx-low.h | 2 ++
gdbserver/nto-low.c | 7 +++----
gdbserver/nto-low.h | 2 ++
gdbserver/server.c | 6 +++---
gdbserver/target.h | 26 +++++++++++++-------------
gdbserver/win32-low.c | 7 +++----
gdbserver/win32-low.h | 2 ++
10 files changed, 36 insertions(+), 32 deletions(-)
Comments
On 2/11/20 9:01 AM, Tankut Baris Aktemur wrote:
> -static int
> -linux_create_inferior (const char *program,
> - const std::vector<char *> &program_args)
> +int
> +linux_process_target::create_inferior (
> + const char *program, const std::vector<char *> &program_args)
No '(' at end of line, please. You can either write:
linux_process_target::create_inferior
(const char *program, const std::vector<char *> &program_args)
... with two leading spaces, or:
linux_process_target::create_inferior (const char *program,
const std::vector<char *> &program_args)
since that fits in 79 cols.
The occurs in a number of other spots in the series, but I won't
comment on them.
Thanks,
Pedro Alves
On Thursday, February 13, 2020 9:27 PM, Pedro Alves wrote:
> On 2/11/20 9:01 AM, Tankut Baris Aktemur wrote:
> > -static int
> > -linux_create_inferior (const char *program,
> > - const std::vector<char *> &program_args)
> > +int
> > +linux_process_target::create_inferior (
> > + const char *program, const std::vector<char *> &program_args)
>
> No '(' at end of line, please. You can either write:
>
> linux_process_target::create_inferior
> (const char *program, const std::vector<char *> &program_args)
>
> ... with two leading spaces, or:
>
> linux_process_target::create_inferior (const char *program,
> const std::vector<char *> &program_args)
>
> since that fits in 79 cols.
Thanks for your comments!
I had seen existing cases of
some_very_long_function_name
(int param1...)
but then I went with the formatting above based on
https://gcc.gnu.org/codingconventions.html#Member_Form
thinking that this is perhaps a C/C++ difference.
I also typed
class linux_process_target : public process_target {
instead of
class linux_process_target : public process_target
{
because of the example shown at
https://gcc.gnu.org/codingconventions.html#Class_Form
I'll fix all occurrences of both formatting issues in v2 of the series.
Thanks,
-Baris
Intel Deutschland GmbH
Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Christin Eisenschmid, Gary Kershaw
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
On 2/14/20 11:01 AM, Aktemur, Tankut Baris wrote:
> On Thursday, February 13, 2020 9:27 PM, Pedro Alves wrote:
>> On 2/11/20 9:01 AM, Tankut Baris Aktemur wrote:
>>> -static int
>>> -linux_create_inferior (const char *program,
>>> - const std::vector<char *> &program_args)
>>> +int
>>> +linux_process_target::create_inferior (
>>> + const char *program, const std::vector<char *> &program_args)
>>
>> No '(' at end of line, please. You can either write:
>>
>> linux_process_target::create_inferior
>> (const char *program, const std::vector<char *> &program_args)
>>
>> ... with two leading spaces, or:
>>
>> linux_process_target::create_inferior (const char *program,
>> const std::vector<char *> &program_args)
>>
>> since that fits in 79 cols.
>
> Thanks for your comments!
>
> I had seen existing cases of
>
> some_very_long_function_name
> (int param1...)
>
> but then I went with the formatting above based on
> https://gcc.gnu.org/codingconventions.html#Member_Form
> thinking that this is perhaps a C/C++ difference.
>
> I also typed
>
> class linux_process_target : public process_target {
>
> instead of
>
> class linux_process_target : public process_target
> {
>
> because of the example shown at
> https://gcc.gnu.org/codingconventions.html#Class_Form
>
Yeah, I don't think even GCC follows those specific points in
the convention much. They were written years ago when GCC was
converting to C++. I think diverging from usual GNU conventions in
these specific cases just adds to confusion, IMO.
> I'll fix all occurrences of both formatting issues in v2 of the series.
Thanks,
Pedro Alves
@@ -996,9 +996,9 @@ linux_ptrace_fun ()
PROGRAM is the name of the program to be started, and PROGRAM_ARGS
are its arguments. */
-static int
-linux_create_inferior (const char *program,
- const std::vector<char *> &program_args)
+int
+linux_process_target::create_inferior (
+ const char *program, const std::vector<char *> &program_args)
{
client_state &cs = get_client_state ();
struct lwp_info *new_lwp;
@@ -7359,7 +7359,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_create_inferior,
linux_post_create_inferior,
linux_attach,
linux_kill,
@@ -269,6 +269,8 @@ extern struct linux_target_ops the_low_target;
class linux_process_target : public process_target {
public:
+ int create_inferior (const char *program,
+ const std::vector<char *> &program_args) override;
};
#define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr)))
@@ -248,9 +248,9 @@ lynx_ptrace_fun ()
/* Implement the create_inferior method of the target_ops vector. */
-static int
-lynx_create_inferior (const char *program,
- const std::vector<char *> &program_args)
+int
+lynx_process_target::create_inferior (
+ const char *program, const std::vector<char *> &program_args)
{
int pid;
std::string str_program_args = stringify_argv (program_args);
@@ -726,7 +726,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- lynx_create_inferior,
NULL, /* post_create_inferior */
lynx_attach,
lynx_kill,
@@ -57,6 +57,8 @@ extern struct lynx_target_ops the_low_target;
class lynx_process_target : public process_target {
public:
+ int create_inferior (const char *program,
+ const std::vector<char *> &program_args) override;
};
/* The inferior's target description. This is a global because the
@@ -350,9 +350,9 @@ nto_read_auxv_from_initial_stack (CORE_ADDR initial_stack,
/* Start inferior specified by PROGRAM, using PROGRAM_ARGS as its
arguments. */
-static int
-nto_create_inferior (const char *program,
- const std::vector<char *> &program_args)
+int
+nto_process_target::create_inferior (
+ const char *program, const std::vector<char *> &program_args)
{
struct inheritance inherit;
pid_t pid;
@@ -935,7 +935,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size)
static nto_process_target the_nto_target;
static process_stratum_target nto_target_ops = {
- nto_create_inferior,
NULL, /* post_create_inferior */
nto_attach,
nto_kill,
@@ -47,6 +47,8 @@ extern struct nto_target_ops the_low_target;
class nto_process_target : public process_target {
public:
+ int create_inferior (const char *program,
+ const std::vector<char *> &program_args) override;
};
/* The inferior's target description. This is a global because the
@@ -3028,7 +3028,7 @@ handle_v_run (char *own_buf)
free_vector_argv (program_args);
program_args = new_argv;
- create_inferior (program_path.get (), program_args);
+ target_create_inferior (program_path.get (), program_args);
if (cs.last_status.kind == TARGET_WAITKIND_STOPPED)
{
@@ -3784,7 +3784,7 @@ captured_main (int argc, char *argv[])
program_args.push_back (NULL);
/* Wait till we are at first instruction in program. */
- create_inferior (program_path.get (), program_args);
+ target_create_inferior (program_path.get (), program_args);
/* We are now (hopefully) stopped at the first instruction of
the target process. This assumes that the target process was
@@ -4303,7 +4303,7 @@ process_serial_event (void)
/* Wait till we are at 1st instruction in prog. */
if (program_path.get () != NULL)
{
- create_inferior (program_path.get (), program_args);
+ target_create_inferior (program_path.get (), program_args);
if (cs.last_status.kind == TARGET_WAITKIND_STOPPED)
{
@@ -70,17 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Start a new process.
-
- PROGRAM is a path to the program to execute.
- PROGRAM_ARGS is a standard NULL-terminated array of arguments,
- to be passed to the inferior as ``argv'' (along with PROGRAM).
-
- Returns the new PID on success, -1 on failure. Registers the new
- process with the process list. */
- int (*create_inferior) (const char *program,
- const std::vector<char *> &program_args);
-
/* Do additional setup after a new process is created, including
exec-wrapper completion. */
void (*post_create_inferior) (void);
@@ -488,14 +477,25 @@ class process_target {
public:
virtual ~process_target () = default;
+
+ /* Start a new process.
+
+ PROGRAM is a path to the program to execute.
+ PROGRAM_ARGS is a standard NULL-terminated array of arguments,
+ to be passed to the inferior as ``argv'' (along with PROGRAM).
+
+ Returns the new PID on success, -1 on failure. Registers the new
+ process with the process list. */
+ virtual int create_inferior
+ (const char *program, const std::vector<char *> &program_args) = 0;
};
extern process_stratum_target *the_target;
void set_target_ops (process_stratum_target *);
-#define create_inferior(program, program_args) \
- (*the_target->create_inferior) (program, program_args)
+#define target_create_inferior(program, program_args) \
+ the_target->pt->create_inferior (program, program_args)
#define target_post_create_inferior() \
do \
@@ -625,9 +625,9 @@ Could not convert the expanded inferior cwd to wide-char."));
PROGRAM_ARGS is the vector containing the inferior's args.
Returns the new PID on success, -1 on failure. Registers the new
process with the process list. */
-static int
-win32_create_inferior (const char *program,
- const std::vector<char *> &program_args)
+int
+win32_process_target::create_inferior (
+ const char *program, const std::vector<char *> &program_args)
{
client_state &cs = get_client_state ();
#ifndef USE_WIN32API
@@ -1828,7 +1828,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size)
static win32_process_target the_win32_target;
static process_stratum_target win32_target_ops = {
- win32_create_inferior,
NULL, /* post_create_inferior */
win32_attach,
win32_kill,
@@ -106,6 +106,8 @@ extern struct win32_target_ops the_low_target;
class win32_process_target : public process_target {
public:
+ int create_inferior (const char *program,
+ const std::vector<char *> &program_args) override;
};
/* Retrieve the context for this thread, if not already retrieved. */