Remove pid_to_ptid

[deliverable/binutils-gdb.git] / gdb / gdbserver / proc-service.c

diff --git a/gdb/gdbserver/proc-service.c b/gdb/gdbserver/proc-service.c
index a8c29ab6f1379965b2563218dfd550c88ee5e2cb..64fdf8a9d5bedc9b520c047c43273d536ea1f672 100644 (file)
--- a/gdb/gdbserver/proc-service.c
+++ b/gdb/gdbserver/proc-service.c
@@ -1,6 +1,5 @@
 /* libthread_db helper functions for the remote server for GDB.
 /* libthread_db helper functions for the remote server for GDB.

-   Copyright 2002, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 2002-2018 Free Software Foundation, Inc.

 
    Contributed by MontaVista Software.
 
 
    Contributed by MontaVista Software.
 


@@ -8,7 +7,7 @@
 
    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
 
    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 2 of the License, or
+   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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -17,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "server.h"
 
 
 #include "server.h"
 


@@ -29,19 +26,7 @@
 
 #include "linux-low.h"
 
 
 #include "linux-low.h"
 

-/* Correct for all GNU/Linux targets (for quite some time).  */
-#define GDB_GREGSET_T elf_gregset_t
-#define GDB_FPREGSET_T elf_fpregset_t
-
-#ifndef HAVE_ELF_FPREGSET_T
-/* Make sure we have said types.  Not all platforms bring in <linux/elf.h>
-   via <sys/procfs.h>.  */
-#ifdef HAVE_LINUX_ELF_H   
-#include <linux/elf.h>    
-#endif
-#endif
-
-#include "../gdb_proc_service.h"
+#include "gdb_proc_service.h"

 
 typedef struct ps_prochandle *gdb_ps_prochandle_t;
 typedef void *gdb_ps_read_buf_t;
 
 typedef struct ps_prochandle *gdb_ps_prochandle_t;
 typedef void *gdb_ps_read_buf_t;


@@ -54,18 +39,20 @@ typedef size_t gdb_ps_size_t;
 
 #ifdef HAVE_REGSETS
 static struct regset_info *
 
 #ifdef HAVE_REGSETS
 static struct regset_info *

-gregset_info(void)
+gregset_info (void)

 {
   int i = 0;
 {
   int i = 0;

+  const struct regs_info *regs_info = (*the_low_target.regs_info) ();
+  struct regsets_info *regsets_info = regs_info->regsets_info;

 
 

-  while (target_regsets[i].size != -1)
+  while (regsets_info->regsets[i].size != -1)

     {
     {

-      if (target_regsets[i].type == GENERAL_REGS)
+      if (regsets_info->regsets[i].type == GENERAL_REGS)

        break;
       i++;
     }
 
        break;
       i++;
     }
 

-  return &target_regsets[i];
+  return &regsets_info->regsets[i];

 }
 #endif
 
 }
 #endif
 


@@ -75,14 +62,14 @@ gregset_info(void)
 
 ps_err_e
 ps_pglobal_lookup (gdb_ps_prochandle_t ph, const char *obj,
 
 ps_err_e
 ps_pglobal_lookup (gdb_ps_prochandle_t ph, const char *obj,

-                  const char *name, paddr_t *sym_addr)
+                  const char *name, psaddr_t *sym_addr)

 {
   CORE_ADDR addr;
 
 {
   CORE_ADDR addr;
 

-  if (look_up_one_symbol (name, &addr) == 0)
+  if (thread_db_look_up_one_symbol (name, &addr) == 0)

     return PS_NOSYM;
 
     return PS_NOSYM;
 

-  *sym_addr = (paddr_t) (unsigned long) addr;
+  *sym_addr = (psaddr_t) (unsigned long) addr;

   return PS_OK;
 }
 
   return PS_OK;
 }
 


@@ -90,20 +77,24 @@ ps_pglobal_lookup (gdb_ps_prochandle_t ph, const char *obj,
    them into BUF.  */
 
 ps_err_e
    them into BUF.  */
 
 ps_err_e

-ps_pdread (gdb_ps_prochandle_t ph, paddr_t addr,
+ps_pdread (gdb_ps_prochandle_t ph, psaddr_t addr,

           gdb_ps_read_buf_t buf, gdb_ps_size_t size)
 {
           gdb_ps_read_buf_t buf, gdb_ps_size_t size)
 {

-  read_inferior_memory (addr, buf, size);
+  if (read_inferior_memory ((uintptr_t) addr, (gdb_byte *) buf, size) != 0)
+    return PS_ERR;

   return PS_OK;
 }
 
 /* Write SIZE bytes from BUF into the target process PH at address ADDR.  */
 
 ps_err_e
   return PS_OK;
 }
 
 /* Write SIZE bytes from BUF into the target process PH at address ADDR.  */
 
 ps_err_e

-ps_pdwrite (gdb_ps_prochandle_t ph, paddr_t addr,
+ps_pdwrite (gdb_ps_prochandle_t ph, psaddr_t addr,

            gdb_ps_write_buf_t buf, gdb_ps_size_t size)
 {
            gdb_ps_write_buf_t buf, gdb_ps_size_t size)
 {

-  return write_inferior_memory (addr, buf, size);
+  if (write_inferior_memory ((uintptr_t) addr, (const gdb_byte *) buf, size)
+      != 0)
+    return PS_ERR;
+  return PS_OK;

 }
 
 /* Get the general registers of LWP LWPID within the target process PH
 }
 
 /* Get the general registers of LWP LWPID within the target process PH


@@ -113,22 +104,21 @@ ps_err_e
 ps_lgetregs (gdb_ps_prochandle_t ph, lwpid_t lwpid, prgregset_t gregset)
 {
 #ifdef HAVE_REGSETS
 ps_lgetregs (gdb_ps_prochandle_t ph, lwpid_t lwpid, prgregset_t gregset)
 {
 #ifdef HAVE_REGSETS

-  struct process_info *process;
-  struct thread_info *reg_inferior, *save_inferior;
+  struct lwp_info *lwp;
+  struct thread_info *reg_thread, *saved_thread;
+  struct regcache *regcache;

 
 

-  process = (struct process_info *) find_inferior_id (&all_processes,
-                                                     lwpid);
-  if (process == NULL)
+  lwp = find_lwp_pid (ptid_t (lwpid));
+  if (lwp == NULL)

     return PS_ERR;
 
     return PS_ERR;
 

-  reg_inferior = get_process_thread (process);
-  save_inferior = current_inferior;
-  current_inferior = reg_inferior;
-
-  the_target->fetch_registers (0);
-  gregset_info()->fill_function (gregset);
+  reg_thread = get_lwp_thread (lwp);
+  saved_thread = current_thread;
+  current_thread = reg_thread;
+  regcache = get_thread_regcache (current_thread, 1);
+  gregset_info ()->fill_function (regcache, gregset);

 
 

-  current_inferior = save_inferior;
+  current_thread = saved_thread;

   return PS_OK;
 #else
   return PS_ERR;
   return PS_OK;
 #else
   return PS_ERR;


@@ -149,8 +139,7 @@ ps_lsetregs (gdb_ps_prochandle_t ph, lwpid_t lwpid, const prgregset_t gregset)
    process PH and store them in FPREGSET.  */
 
 ps_err_e
    process PH and store them in FPREGSET.  */
 
 ps_err_e

-ps_lgetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
-              gdb_prfpregset_t *fpregset)
+ps_lgetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid, prfpregset_t *fpregset)

 {
   /* Unneeded.  */
   return PS_ERR;
 {
   /* Unneeded.  */
   return PS_ERR;


@@ -160,8 +149,7 @@ ps_lgetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
    process PH from FPREGSET.  */
 
 ps_err_e
    process PH from FPREGSET.  */
 
 ps_err_e

-ps_lsetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
-              const gdb_prfpregset_t *fpregset)
+ps_lsetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid, const prfpregset_t *fpregset)

 {
   /* Unneeded.  */
   return PS_ERR;
 {
   /* Unneeded.  */
   return PS_ERR;


@@ -173,7 +161,5 @@ ps_lsetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
 pid_t
 ps_getpid (gdb_ps_prochandle_t ph)
 {
 pid_t
 ps_getpid (gdb_ps_prochandle_t ph)
 {

-  return ph->pid;
+  return pid_of (current_thread);

 }
 }

-
-