Multi-target support

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

diff --git a/gdb/proc-service.c b/gdb/proc-service.c
index 393cd909277fd46c5ee7a78d5c6d2243ff3a2080..86f79ad5838931faf15914c4930a094c15b9c85e 100644 (file)
--- a/gdb/proc-service.c
+++ b/gdb/proc-service.c
@@ -1,6 +1,6 @@
 /* <proc_service.h> implementation.
 
-   Copyright (C) 1999-2018 Free Software Foundation, Inc.
+   Copyright (C) 1999-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -70,17 +70,22 @@ static ps_err_e
 ps_xfer_memory (const struct ps_prochandle *ph, psaddr_t addr,
                gdb_byte *buf, size_t len, int write)
 {
-  scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid);
-  int ret;
-  CORE_ADDR core_addr = ps_addr_to_core_addr (addr);
+  scoped_restore_current_inferior restore_inferior;
+  set_current_inferior (ph->thread->inf);
 
+  scoped_restore_current_program_space restore_current_progspace;
+  set_current_program_space (ph->thread->inf->pspace);
+
+  scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid);
   inferior_ptid = ph->thread->ptid;
 
+  CORE_ADDR core_addr = ps_addr_to_core_addr (addr);
+
+  int ret;
   if (write)
     ret = target_write_memory (core_addr, buf, len);
   else
     ret = target_read_memory (core_addr, buf, len);
-
   return (ret == 0 ? PS_OK : PS_ERR);
 }
 \f
@@ -129,16 +134,15 @@ ps_pdwrite (struct ps_prochandle *ph, psaddr_t addr,
 /* Get a regcache for LWPID using its inferior's "main" architecture,
    which is the register set libthread_db expects to be using.  In
    multi-arch debugging scenarios, the thread's architecture may
-   differ from the inferior's "main" architecture.  E.g., in the Cell
-   combined debugger, if GDB happens to interrupt SPU code, the
-   thread's architecture is SPU, and the main architecture is
-   PowerPC.  */
+   differ from the inferior's "main" architecture.  */
 
 static struct regcache *
 get_ps_regcache (struct ps_prochandle *ph, lwpid_t lwpid)
 {
   inferior *inf = ph->thread->inf;
-  return get_thread_arch_regcache (ptid_t (inf->pid, lwpid), inf->gdbarch);
+  return get_thread_arch_regcache (inf->process_target (),
+                                  ptid_t (inf->pid, lwpid),
+                                  inf->gdbarch);
 }
 
 /* Get the general registers of LWP LWPID within the target process PH
@@ -173,7 +177,8 @@ ps_lsetregs (struct ps_prochandle *ph, lwpid_t lwpid, const prgregset_t gregset)
    process PH and store them in FPREGSET.  */
 
 ps_err_e
-ps_lgetfpregs (struct ps_prochandle *ph, lwpid_t lwpid, gdb_prfpregset_t *fpregset)
+ps_lgetfpregs (struct ps_prochandle *ph, lwpid_t lwpid,
+              prfpregset_t *fpregset)
 {
   struct regcache *regcache = get_ps_regcache (ph, lwpid);
 
@@ -188,7 +193,7 @@ ps_lgetfpregs (struct ps_prochandle *ph, lwpid_t lwpid, gdb_prfpregset_t *fpregs
 
 ps_err_e
 ps_lsetfpregs (struct ps_prochandle *ph, lwpid_t lwpid,
-              const gdb_prfpregset_t *fpregset)
+              const prfpregset_t *fpregset)
 {
   struct regcache *regcache = get_ps_regcache (ph, lwpid);
 
@@ -204,7 +209,7 @@ ps_lsetfpregs (struct ps_prochandle *ph, lwpid_t lwpid,
 pid_t
 ps_getpid (struct ps_prochandle *ph)
 {
-  return ptid_get_pid (ph->thread->ptid);
+  return ph->thread->ptid.pid ();
 }
 
 void