From: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
To: gdb-patches@sourceware.org
Cc: palves@redhat.com
Subject: [PATCH v2 02/58] gdbserver: turn target op 'create_inferior' into a method
Date: Mon, 17 Feb 2020 16:59:00 -0000 [thread overview]
Message-ID: <1b5a38b090f3bb76e84f7660fbf68c8adf8aef5a.1581956646.git.tankut.baris.aktemur@intel.com> (raw)
In-Reply-To: <cover.1581956646.git.tankut.baris.aktemur@intel.com>
In-Reply-To: <cover.1581956646.git.tankut.baris.aktemur@intel.com>
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Turn process_stratum_target's create_inferior op into 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 classes and callers below.
* server.cc (handle_v_run): Update.
(captured_main): Update.
(process_serial_event): Update.
* linux-low.cc (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.cc (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.cc (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.cc (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.cc | 7 +++----
gdbserver/linux-low.h | 2 ++
gdbserver/lynx-low.cc | 9 ++++-----
gdbserver/lynx-low.h | 2 ++
gdbserver/nto-low.cc | 7 +++----
gdbserver/nto-low.h | 2 ++
gdbserver/server.cc | 6 +++---
gdbserver/target.h | 26 +++++++++++++-------------
gdbserver/win32-low.cc | 7 +++----
gdbserver/win32-low.h | 2 ++
10 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index 17f360639a4..0521afcfc19 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -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,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index e6042735f38..f49af7b2be3 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -270,6 +270,8 @@ 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)))
diff --git a/gdbserver/lynx-low.cc b/gdbserver/lynx-low.cc
index f1177920921..9566e12d2df 100644
--- a/gdbserver/lynx-low.cc
+++ b/gdbserver/lynx-low.cc
@@ -248,14 +248,14 @@ 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);
- lynx_debug ("lynx_create_inferior ()");
+ lynx_debug ("create_inferior ()");
pid = fork_inferior (program,
str_program_args.c_str (),
@@ -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,
diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h
index 923725dd003..66cfdfa870c 100644
--- a/gdbserver/lynx-low.h
+++ b/gdbserver/lynx-low.h
@@ -58,6 +58,8 @@ 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
diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc
index 6f12a735c12..c27126f3126 100644
--- a/gdbserver/nto-low.cc
+++ b/gdbserver/nto-low.cc
@@ -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,
diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h
index 2695db98737..3bad08b82ac 100644
--- a/gdbserver/nto-low.h
+++ b/gdbserver/nto-low.h
@@ -48,6 +48,8 @@ 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
diff --git a/gdbserver/server.cc b/gdbserver/server.cc
index 3fc026f78eb..73f8e185477 100644
--- a/gdbserver/server.cc
+++ b/gdbserver/server.cc
@@ -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)
{
diff --git a/gdbserver/target.h b/gdbserver/target.h
index af78d8caa90..b6d04139108 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -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);
@@ -489,14 +478,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 \
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 2a7b2964d92..ecef54c461e 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -633,9 +633,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
@@ -1839,7 +1839,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,
diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index ff96f804fbd..c922d735068 100644
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -107,6 +107,8 @@ 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. */
--
2.17.1
next prev parent reply other threads:[~2020-02-17 16:59 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 17:01 [PATCH v2 00/58] Turn gdbserver's process_stratum_target into a class Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 03/58] gdbserver: turn target op 'post_create_inferior' into a method Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 13/58] gdbserver: turn prepare_to_access_memory & done_accessing_memory into methods Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 07/58] gdbserver: turn target op 'mourn' into a method Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 09/58] gdbserver: turn target op 'thread_alive' " Tankut Baris Aktemur
2020-02-17 16:59 ` Tankut Baris Aktemur [this message]
2020-02-17 16:59 ` [PATCH v2 15/58] gdbserver: turn target op 'look_up_symbols' " Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 14/58] gdbserver: turn target ops 'read_memory' and 'write_memory' into methods Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 10/58] gdbserver: turn target op 'resume' into a method Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 12/58] gdbserver: turn target ops 'fetch_registers' and 'store_registers' into methods Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 27/58] gdbserver: turn target op 'qxfer_osdata' into a method Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 05/58] gdbserver: turn target op 'kill' " Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 08/58] gdbserver: turn target op 'join' " Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 16/58] gdbserver: turn target op 'request_interrupt' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 21/58] gdbserver: turn target op '{supports_}stopped_by_hw_breakpoint' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 06/58] gdbserver: turn target op 'detach' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 37/58] gdbserver: turn target op 'supports_tracepoints' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 43/58] gdbserver: turn fast tracepoint target ops into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 55/58] gdbserver: turn target op 'supports_catch_syscall' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 53/58] gdbserver: turn target ops 'thread_name' and 'thread_handle' into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 23/58] gdbserver: turn target ops 'stopped_by_watchpoint' and 'stopped_data_address' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 24/58] gdbserver: turn target op 'read_offsets' into a method Tankut Baris Aktemur
2020-02-19 14:09 ` Pedro Alves
2020-02-17 17:01 ` [PATCH v2 42/58] gdbserver: turn target op 'stabilize_threads' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 44/58] gdbserver: turn target op 'emit_ops' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 19/58] gdbserver: turn target ops 'insert_point' and 'remove_point' into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 11/58] gdbserver: turn target op 'wait' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 56/58] gdbserver: turn target op 'get_ipa_tdesc_idx' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 28/58] gdbserver: turn target op 'qxfer_siginfo' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 34/58] gdbserver: turn target op 'core_of_thread' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 26/58] gdbserver: turn target op 'hostio_last_error' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 49/58] gdbserver: turn target op 'supports_range_stepping' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 22/58] gdbserver: turn target op 'supports_hardware_single_step' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 35/58] gdbserver: turn target op 'read_loadmap' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 01/58] gdbserver: start turning the target ops vector into a class Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 54/58] gdbserver: turn target op 'supports_software_single_step' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 38/58] gdbserver: turn target ops 'read_pc' and 'write_pc' into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 39/58] gdbserver: turn target op 'thread_stopped' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 25/58] gdbserver: turn target op 'get_tls_address' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 30/58] gdbserver: turn target op 'supports_multi_process' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 40/58] gdbserver: turn target op 'get_tib_address' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 29/58] gdbserver: turn non-stop and async target ops into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 33/58] gdbserver: turn target op 'handle_monitor_command' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 17/58] gdbserver: turn target op 'read_auxv' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 04/58] gdbserver: turn target op 'attach' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 45/58] gdbserver: turn target op 'supports_disable_randomization' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 32/58] gdbserver: turn target op 'handle_new_gdb_connection' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 52/58] gdbserver: turn breakpoint kind-related target ops into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 47/58] gdbserver: turn target op 'supports_agent' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 18/58] gdbserver: turn target op 'supports_z_point_type' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 57/58] gdbserver: simply copy the pointer in 'set_target_ops' Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 20/58] gdbserver: turn target op '{supports_}stopped_by_sw_breakpoint' into a method Tankut Baris Aktemur
2020-02-17 17:04 ` [PATCH v2 50/58] gdbserver: turn target op 'pid_to_exec_file' " Tankut Baris Aktemur
2020-02-17 17:04 ` [PATCH v2 48/58] gdbserver: turn btrace-related target ops into methods Tankut Baris Aktemur
2020-02-17 17:04 ` [PATCH v2 58/58] gdbserver: finish turning the target ops vector into a class Tankut Baris Aktemur
2020-02-17 17:04 ` [PATCH v2 41/58] gdbserver: turn target ops 'pause_all' and 'unpause_all' into methods Tankut Baris Aktemur
2020-02-17 17:05 ` [PATCH v2 36/58] gdbserver: turn target op 'process_qsupported' into a method Tankut Baris Aktemur
2020-02-17 17:05 ` [PATCH v2 46/58] gdbserver: turn target op 'qxfer_libraries_svr4' " Tankut Baris Aktemur
2020-02-17 17:05 ` [PATCH v2 31/58] gdbserver: turn target ops 'supports_{fork,vfork,exec}_events' into methods Tankut Baris Aktemur
2020-02-17 17:05 ` [PATCH v2 51/58] gdbserver: turn target ops 'multifs_{open, readlink, unlink}' " Tankut Baris Aktemur
2020-02-19 2:46 ` [PATCH v2 00/58] Turn gdbserver's process_stratum_target into a class Simon Marchi
2020-02-20 17:04 ` Tom Tromey
2020-02-19 14:11 ` Pedro Alves
2020-02-20 16:03 ` Aktemur, Tankut Baris
2020-02-20 17:02 ` Tom Tromey
2020-02-21 8:08 ` Aktemur, Tankut Baris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1b5a38b090f3bb76e84f7660fbf68c8adf8aef5a.1581956646.git.tankut.baris.aktemur@intel.com \
--to=tankut.baris.aktemur@intel.com \
--cc=gdb-patches@sourceware.org \
--cc=palves@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).