/* <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.
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
return ps_xfer_memory (ph, addr, (gdb_byte *) buf, size, 1);
}
+/* 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. */
+
+static struct regcache *
+get_ps_regcache (struct ps_prochandle *ph, lwpid_t lwpid)
+{
+ inferior *inf = ph->thread->inf;
+ 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
and store them in GREGSET. */
ps_err_e
ps_lgetregs (struct ps_prochandle *ph, lwpid_t lwpid, prgregset_t gregset)
{
- struct regcache *regcache = get_thread_regcache (ph->thread);
+ struct regcache *regcache = get_ps_regcache (ph, lwpid);
target_fetch_registers (regcache, -1);
fill_gregset (regcache, (gdb_gregset_t *) gregset, -1);
ps_err_e
ps_lsetregs (struct ps_prochandle *ph, lwpid_t lwpid, const prgregset_t gregset)
{
- struct regcache *regcache = get_thread_regcache (ph->thread);
+ struct regcache *regcache = get_ps_regcache (ph, lwpid);
supply_gregset (regcache, (const gdb_gregset_t *) gregset);
target_store_registers (regcache, -1);
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_thread_regcache (ph->thread);
+ struct regcache *regcache = get_ps_regcache (ph, lwpid);
target_fetch_registers (regcache, -1);
fill_fpregset (regcache, (gdb_fpregset_t *) fpregset, -1);
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_thread_regcache (ph->thread);
+ struct regcache *regcache = get_ps_regcache (ph, lwpid);
supply_fpregset (regcache, (const gdb_fpregset_t *) fpregset);
target_store_registers (regcache, -1);
pid_t
ps_getpid (struct ps_prochandle *ph)
{
- return ptid_get_pid (ph->thread->ptid);
+ return ph->thread->ptid.pid ();
}
void