From patchwork Mon Feb 17 16:57:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aktemur, Tankut Baris" X-Patchwork-Id: 38132 Received: (qmail 109970 invoked by alias); 17 Feb 2020 16:59:25 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 109952 invoked by uid 89); 17 Feb 2020 16:59:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=completion, thr, sk:linux_p, the_target X-HELO: mga02.intel.com Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Feb 2020 16:59:22 +0000 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Feb 2020 08:59:20 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga008.fm.intel.com with ESMTP; 17 Feb 2020 08:59:18 -0800 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 01HGxH3B028148; Mon, 17 Feb 2020 16:59:17 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01HGxHCX026950; Mon, 17 Feb 2020 17:59:17 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01HGxHO3026946; Mon, 17 Feb 2020 17:59:17 +0100 From: Tankut Baris Aktemur 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 17:57:10 +0100 Message-Id: <1b5a38b090f3bb76e84f7660fbf68c8adf8aef5a.1581956646.git.tankut.baris.aktemur@intel.com> In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes gdbserver/ChangeLog: 2020-02-10 Tankut Baris Aktemur 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 &program_args) +int +linux_process_target::create_inferior (const char *program, + const std::vector &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 &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 &program_args) +int +lynx_process_target::create_inferior (const char *program, + const std::vector &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 &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 &program_args) +int +nto_process_target::create_inferior (const char *program, + const std::vector &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 &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 &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 &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 &program_args) +int +win32_process_target::create_inferior (const char *program, + const std::vector &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 &program_args) override; }; /* Retrieve the context for this thread, if not already retrieved. */