5ed8105e02
After all the make_cleanup_restore_current_thread fixing, I thought I'd convert that and its relatives (which are all cleanups) to RAII classes. scoped_restore_current_pspace_and_thread was put in a separate file to avoid a circular dependency. Tested on x86-64 Fedora 23, native and gdbserver. gdb/ChangeLog: 2017-05-04 Pedro Alves <palves@redhat.com> * Makefile.in (SFILES): Add progspace-and-thread.c. (HFILES_NO_SRCDIR): Add progspace-and-thread.h. (COMMON_OBS): Add progspace-and-thread.o. * breakpoint.c: Include "progspace-and-thread.h". (update_inserted_breakpoint_locations) (insert_breakpoint_locations, create_longjmp_master_breakpoint): Use scoped_restore_current_pspace_and_thread. (create_std_terminate_master_breakpoint): Use scoped_restore_current_program_space. (remove_breakpoint): Use scoped_restore_current_pspace_and_thread. (print_breakpoint_location): Use scoped_restore_current_program_space. (bp_loc_is_permanent): Use scoped_restore_current_pspace_and_thread. (resolve_sal_pc): Use scoped_restore_current_pspace_and_thread. (download_tracepoint_locations): Use scoped_restore_current_pspace_and_thread. (breakpoint_re_set): Use scoped_restore_current_pspace_and_thread. * exec.c (exec_close_1): Use scoped_restore_current_program_space. (enum step_over_calls_kind): Moved from inferior.h. (class scoped_restore_current_thread): New class. * gdbthread.h (make_cleanup_restore_current_thread): Delete declaration. (scoped_restore_current_thread): New class. * infcmd.c: Include "common/gdb_optional.h". (continue_1, proceed_after_attach): Use scoped_restore_current_thread. (notice_new_inferior): Use scoped_restore_current_thread. * inferior.c: Include "progspace-and-thread.h". (restore_inferior, save_current_inferior): Delete. (add_inferior_command, clone_inferior_command): Use scoped_restore_current_pspace_and_thread. * inferior.h (scoped_restore_current_inferior): New class. * infrun.c: Include "progspace-and-thread.h" and "common/gdb_optional.h". (follow_fork_inferior): Use scoped_restore_current_pspace_and_thread. (scoped_restore_exited_inferior): New class. (handle_vfork_child_exec_or_exit): Use scoped_restore_exited_inferior, scoped_restore_current_pspace_and_thread, scoped_restore_current_thread and scoped_restore. (fetch_inferior_event): Use scoped_restore_current_thread. * linespec.c (decode_line_full, decode_line_1): Use scoped_restore_current_program_space. * mi/mi-main.c: Include "progspace-and-thread.h". (exec_continue): Use scoped_restore_current_thread. (mi_cmd_exec_run): Use scoped_restore_current_pspace_and_thread. (mi_cmd_trace_frame_collected): Use scoped_restore_current_thread. * proc-service.c (ps_pglobal_lookup): Use scoped_restore_current_program_space. * progspace-and-thread.c: New file. * progspace-and-thread.h: New file. * progspace.c (release_program_space, clone_program_space): Use scoped_restore_current_program_space. (restore_program_space, save_current_program_space) (save_current_space_and_thread): Delete. (switch_to_program_space_and_thread): Moved to progspace-and-thread.c. * progspace.h (save_current_program_space) (save_current_space_and_thread): Delete declarations. (scoped_restore_current_program_space): New class. * remote.c (remote_btrace_maybe_reopen): Use scoped_restore_current_thread. * symtab.c: Include "progspace-and-thread.h". (skip_prologue_sal): Use scoped_restore_current_pspace_and_thread. * thread.c (print_thread_info_1): Use scoped_restore_current_thread. (struct current_thread_cleanup): Delete. (do_restore_current_thread_cleanup) (restore_current_thread_cleanup_dtor): Rename/convert both to ... (scoped_restore_current_thread::~scoped_restore_current_thread): ... this new dtor. (make_cleanup_restore_current_thread): Rename/convert to ... (scoped_restore_current_thread::scoped_restore_current_thread): ... this new ctor. (thread_apply_all_command): Use scoped_restore_current_thread. (thread_apply_command): Use scoped_restore_current_thread. * tracepoint.c (tdump_command): Use scoped_restore_current_thread. * varobj.c (value_of_root_1): Use scoped_restore_current_thread.
233 lines
6.2 KiB
C
233 lines
6.2 KiB
C
/* <proc_service.h> implementation.
|
||
|
||
Copyright (C) 1999-2017 Free Software Foundation, Inc.
|
||
|
||
This file is part of GDB.
|
||
|
||
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 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
This program is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
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, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#include "defs.h"
|
||
|
||
#include "gdbcore.h"
|
||
#include "inferior.h"
|
||
#include "symtab.h"
|
||
#include "target.h"
|
||
#include "regcache.h"
|
||
#include "objfiles.h"
|
||
|
||
#include "gdb_proc_service.h"
|
||
|
||
#include <sys/procfs.h>
|
||
|
||
/* Prototypes for supply_gregset etc. */
|
||
#include "gregset.h"
|
||
|
||
|
||
/* Fix-up some broken systems. */
|
||
|
||
/* The prototypes in <proc_service.h> are slightly different on older
|
||
systems. Compensate for the discrepancies. */
|
||
|
||
#ifdef PROC_SERVICE_IS_OLD
|
||
typedef const struct ps_prochandle *gdb_ps_prochandle_t;
|
||
typedef char *gdb_ps_read_buf_t;
|
||
typedef char *gdb_ps_write_buf_t;
|
||
typedef int gdb_ps_size_t;
|
||
#else
|
||
typedef struct ps_prochandle *gdb_ps_prochandle_t;
|
||
typedef void *gdb_ps_read_buf_t;
|
||
typedef const void *gdb_ps_write_buf_t;
|
||
typedef size_t gdb_ps_size_t;
|
||
#endif
|
||
|
||
|
||
/* Helper functions. */
|
||
|
||
/* Convert a psaddr_t to a CORE_ADDR. */
|
||
|
||
static CORE_ADDR
|
||
ps_addr_to_core_addr (psaddr_t addr)
|
||
{
|
||
if (exec_bfd && bfd_get_sign_extend_vma (exec_bfd))
|
||
return (intptr_t) addr;
|
||
else
|
||
return (uintptr_t) addr;
|
||
}
|
||
|
||
/* Convert a CORE_ADDR to a psaddr_t. */
|
||
|
||
static psaddr_t
|
||
core_addr_to_ps_addr (CORE_ADDR addr)
|
||
{
|
||
if (exec_bfd && bfd_get_sign_extend_vma (exec_bfd))
|
||
return (psaddr_t) (intptr_t) addr;
|
||
else
|
||
return (psaddr_t) (uintptr_t) addr;
|
||
}
|
||
|
||
/* Transfer LEN bytes of memory between BUF and address ADDR in the
|
||
process specified by PH. If WRITE, transfer them to the process,
|
||
else transfer them from the process. Returns PS_OK for success,
|
||
PS_ERR on failure.
|
||
|
||
This is a helper function for ps_pdread and ps_pdwrite. */
|
||
|
||
static ps_err_e
|
||
ps_xfer_memory (const struct ps_prochandle *ph, psaddr_t addr,
|
||
gdb_byte *buf, size_t len, int write)
|
||
{
|
||
struct cleanup *old_chain = save_inferior_ptid ();
|
||
int ret;
|
||
CORE_ADDR core_addr = ps_addr_to_core_addr (addr);
|
||
|
||
inferior_ptid = ph->ptid;
|
||
|
||
if (write)
|
||
ret = target_write_memory (core_addr, buf, len);
|
||
else
|
||
ret = target_read_memory (core_addr, buf, len);
|
||
|
||
do_cleanups (old_chain);
|
||
|
||
return (ret == 0 ? PS_OK : PS_ERR);
|
||
}
|
||
|
||
|
||
/* Search for the symbol named NAME within the object named OBJ within
|
||
the target process PH. If the symbol is found the address of the
|
||
symbol is stored in SYM_ADDR. */
|
||
|
||
ps_err_e
|
||
ps_pglobal_lookup (gdb_ps_prochandle_t ph, const char *obj,
|
||
const char *name, psaddr_t *sym_addr)
|
||
{
|
||
struct inferior *inf = find_inferior_ptid (ph->ptid);
|
||
|
||
scoped_restore_current_program_space restore_pspace;
|
||
|
||
set_current_program_space (inf->pspace);
|
||
|
||
/* FIXME: kettenis/2000-09-03: What should we do with OBJ? */
|
||
bound_minimal_symbol ms = lookup_minimal_symbol (name, NULL, NULL);
|
||
if (ms.minsym == NULL)
|
||
return PS_NOSYM;
|
||
|
||
*sym_addr = core_addr_to_ps_addr (BMSYMBOL_VALUE_ADDRESS (ms));
|
||
return PS_OK;
|
||
}
|
||
|
||
/* Read SIZE bytes from the target process PH at address ADDR and copy
|
||
them into BUF. */
|
||
|
||
ps_err_e
|
||
ps_pdread (gdb_ps_prochandle_t ph, psaddr_t addr,
|
||
gdb_ps_read_buf_t buf, gdb_ps_size_t size)
|
||
{
|
||
return ps_xfer_memory (ph, addr, (gdb_byte *) buf, size, 0);
|
||
}
|
||
|
||
/* Write SIZE bytes from BUF into the target process PH at address ADDR. */
|
||
|
||
ps_err_e
|
||
ps_pdwrite (gdb_ps_prochandle_t ph, psaddr_t addr,
|
||
gdb_ps_write_buf_t buf, gdb_ps_size_t size)
|
||
{
|
||
return ps_xfer_memory (ph, addr, (gdb_byte *) buf, size, 1);
|
||
}
|
||
|
||
/* Get the general registers of LWP LWPID within the target process PH
|
||
and store them in GREGSET. */
|
||
|
||
ps_err_e
|
||
ps_lgetregs (gdb_ps_prochandle_t ph, lwpid_t lwpid, prgregset_t gregset)
|
||
{
|
||
ptid_t ptid = ptid_build (ptid_get_pid (ph->ptid), lwpid, 0);
|
||
struct regcache *regcache
|
||
= get_thread_arch_regcache (ptid, target_gdbarch ());
|
||
|
||
target_fetch_registers (regcache, -1);
|
||
fill_gregset (regcache, (gdb_gregset_t *) gregset, -1);
|
||
|
||
return PS_OK;
|
||
}
|
||
|
||
/* Set the general registers of LWP LWPID within the target process PH
|
||
from GREGSET. */
|
||
|
||
ps_err_e
|
||
ps_lsetregs (gdb_ps_prochandle_t ph, lwpid_t lwpid, const prgregset_t gregset)
|
||
{
|
||
ptid_t ptid = ptid_build (ptid_get_pid (ph->ptid), lwpid, 0);
|
||
struct regcache *regcache
|
||
= get_thread_arch_regcache (ptid, target_gdbarch ());
|
||
|
||
supply_gregset (regcache, (const gdb_gregset_t *) gregset);
|
||
target_store_registers (regcache, -1);
|
||
|
||
return PS_OK;
|
||
}
|
||
|
||
/* Get the floating-point registers of LWP LWPID within the target
|
||
process PH and store them in FPREGSET. */
|
||
|
||
ps_err_e
|
||
ps_lgetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
|
||
gdb_prfpregset_t *fpregset)
|
||
{
|
||
ptid_t ptid = ptid_build (ptid_get_pid (ph->ptid), lwpid, 0);
|
||
struct regcache *regcache
|
||
= get_thread_arch_regcache (ptid, target_gdbarch ());
|
||
|
||
target_fetch_registers (regcache, -1);
|
||
fill_fpregset (regcache, (gdb_fpregset_t *) fpregset, -1);
|
||
|
||
return PS_OK;
|
||
}
|
||
|
||
/* Set the floating-point registers of LWP LWPID within the target
|
||
process PH from FPREGSET. */
|
||
|
||
ps_err_e
|
||
ps_lsetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
|
||
const gdb_prfpregset_t *fpregset)
|
||
{
|
||
ptid_t ptid = ptid_build (ptid_get_pid (ph->ptid), lwpid, 0);
|
||
struct regcache *regcache
|
||
= get_thread_arch_regcache (ptid, target_gdbarch ());
|
||
|
||
supply_fpregset (regcache, (const gdb_fpregset_t *) fpregset);
|
||
target_store_registers (regcache, -1);
|
||
|
||
return PS_OK;
|
||
}
|
||
|
||
/* Return overall process id of the target PH. Special for GNU/Linux
|
||
-- not used on Solaris. */
|
||
|
||
pid_t
|
||
ps_getpid (gdb_ps_prochandle_t ph)
|
||
{
|
||
return ptid_get_pid (ph->ptid);
|
||
}
|
||
|
||
/* Provide a prototype to silence -Wmissing-prototypes. */
|
||
extern initialize_file_ftype _initialize_proc_service;
|
||
|
||
void
|
||
_initialize_proc_service (void)
|
||
{
|
||
/* This function solely exists to make sure this module is linked
|
||
into the final binary. */
|
||
}
|