gdbserver: turn target op 'create_inferior' into a method

gdbserver/ChangeLog:
2020-02-20  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.

diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index c8f64541f19731d5a71858324ba0ee999fc7aabe..7dd9cf366022e86f2a8c2b79ef21296f49ff01ea 100644 (file)
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,3 +1,35 @@
+2020-02-20  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.
+
 2020-02-20  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
 
        * target.h (class process_target): New class definition.

diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index 17f360639a4d5d4b8bcd000c3295766f93d072f8..0521afcfc19576389b66e7f23ba065ba5f61d515 100644 (file)
--- 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 e6042735f388dc006113d28712ced87cb3a0200b..f49af7b2be3ca9190a4657d7932043d0d0b5c234 100644 (file)
--- 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 f1177920921f033abd9702be36081099d4ebe6b6..9566e12d2df210b0ab5485efd25384629a5501c8 100644 (file)
--- 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 923725dd003bfca8fed6ef9feed6e648b97e5b2a..66cfdfa870c7e3001a4e62740a2b05d6128be9f5 100644 (file)
--- 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 6f12a735c1206bc787d91e62d31adff315db095c..c27126f3126fc31db7745114ef4ec0673deb01ca 100644 (file)
--- 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 2695db98737083a2d5e8f3f5a7ebf16816e307e1..3bad08b82ac079cd62d4d00eaa99b41322c2d237 100644 (file)
--- 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 3fc026f78ebba4db17134befd3b7607e68ed04ff..73f8e185477378989dbbcbfe859ddb9f3d91ef3f 100644 (file)
--- 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 af78d8caa902acb745cc65095256f3c2efe2b8a1..b6d04139108d599cdb2327eb97350579f4279398 100644 (file)
--- 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 2a7b2964d926c8e0ecd9f7e7266b4c311d100ec3..ecef54c461ebeea56d0434e9853eb8f346b7d36a 100644 (file)
--- 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 ff96f804fbdd997a34df3181498a75c6a4882880..c922d735068aa97447766bc6cab143939053f380 100644 (file)
--- 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.  */