mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-06 00:34:26 +08:00
a068643d69
Currently the target pid_to_str method returns a const char *, so many implementations have a static buffer that they update. This patch changes these methods to return a std::string instead. I think this is cleaner and avoids possible gotchas when calling pid_to_str on different ptids in a single statement. (Though no such calls exist currently.) This also updates various helper functions, and the gdbarch pid_to_str methods. I also made a best effort to fix all the callers, but I can't build some of the *-nat.c files. Tested by the buildbot. gdb/ChangeLog 2019-03-13 Tom Tromey <tromey@adacore.com> * i386-gnu-nat.c (i386_gnu_nat_target::fetch_registers) (i386_gnu_nat_target::store_registers): Update. * target-debug.h (target_debug_print_std_string): New macro. * x86-linux-nat.c (x86_linux_nat_target::enable_btrace): Update. * windows-tdep.c (display_one_tib): Update. * tui/tui-stack.c (tui_make_status_line): Update. * top.c (print_inferior_quit_action): Update. * thread.c (thr_try_catch_cmd): Update. (add_thread_with_info): Update. (thread_target_id_str): Update. (thr_try_catch_cmd): Update. (thread_command): Update. (thread_find_command): Update. * record-btrace.c (record_btrace_target::info_record) (record_btrace_resume_thread, record_btrace_target::resume) (record_btrace_cancel_resume, record_btrace_step_thread) (record_btrace_target::wait, record_btrace_target::wait) (record_btrace_target::wait, record_btrace_target::stop): Update. * progspace.c (print_program_space): Update. * process-stratum-target.c (process_stratum_target::thread_address_space): Update. * linux-fork.c (linux_fork_mourn_inferior) (detach_checkpoint_command, info_checkpoints_command) (linux_fork_context): Update. (linux_fork_detach): Update. (class scoped_switch_fork_info): Update. (delete_checkpoint_command): Update. * infrun.c (follow_fork_inferior): Update. (follow_fork_inferior): Update. (proceed_after_vfork_done): Update. (handle_vfork_child_exec_or_exit): Update. (follow_exec): Update. (displaced_step_prepare_throw): Update. (displaced_step_restore): Update. (start_step_over): Update. (resume_1): Update. (clear_proceed_status_thread): Update. (proceed): Update. (print_target_wait_results): Update. (do_target_wait): Update. (context_switch): Update. (stop_all_threads): Update. (restart_threads): Update. (finish_step_over): Update. (handle_signal_stop): Update. (switch_back_to_stepped_thread): Update. (keep_going_pass_signal): Update. (print_exited_reason): Update. (normal_stop): Update. * inferior.c (inferior_pid_to_str): Change return type. (print_selected_inferior): Update. (add_inferior): Update. (detach_inferior): Update. * dummy-frame.c (fprint_dummy_frames): Update. * dcache.c (dcache_info_1): Update. * btrace.c (btrace_enable, btrace_disable, btrace_teardown) (btrace_fetch, btrace_clear): Update. * linux-tdep.c (linux_core_pid_to_str): Change return type. * i386-cygwin-tdep.c (i386_windows_core_pid_to_str): Change return type. * fbsd-tdep.c (fbsd_core_pid_to_str): Change return type. * sol2-tdep.h (sol2_core_pid_to_str): Change return type. * sol2-tdep.c (sol2_core_pid_to_str): Change return type. * gdbarch.c, gdbarch.h: Rebuild. * gdbarch.sh (core_pid_to_str): Change return type. * windows-nat.c (struct windows_nat_target) <pid_to_str>: Change return type. (windows_nat_target::pid_to_str): Change return type. (windows_delete_thread): Update. (windows_nat_target::attach): Update. (windows_nat_target::files_info): Update. * target-delegates.c: Rebuild. * sol-thread.c (class sol_thread_target) <pid_to_str>: Change return type. (sol_thread_target::pid_to_str): Change return type. * remote.c (class remote_target) <pid_to_str>: Change return type. (remote_target::pid_to_str): Change return type. (extended_remote_target::attach, remote_target::remote_stop_ns) (remote_target::remote_notif_remove_queued_reply) (remote_target::push_stop_reply, remote_target::disable_btrace): Update. (extended_remote_target::attach): Update. * remote-sim.c (struct gdbsim_target) <pid_to_str>: Change return type. (gdbsim_target::pid_to_str): Change return type. * ravenscar-thread.c (struct ravenscar_thread_target) <pid_to_str>: Change return type. (ravenscar_thread_target::pid_to_str): Change return type. * procfs.c (class procfs_target) <pid_to_str>: Change return type. (procfs_target::pid_to_str): Change return type. (procfs_target::attach): Update. (procfs_target::detach): Update. (procfs_target::fetch_registers): Update. (procfs_target::store_registers): Update. (procfs_target::wait): Update. (procfs_target::files_info): Update. * obsd-nat.c (obsd_nat_target::pid_to_str): Change return type. * nto-procfs.c (struct nto_procfs_target) <pid_to_str>: Change return type. (nto_procfs_target::pid_to_str): Change return type. (nto_procfs_target::files_info, nto_procfs_target::attach): Update. * linux-thread-db.c (class thread_db_target) <pid_to_str>: Change return type. * linux-nat.c (linux_nat_target::pid_to_str): Change return type. (exit_lwp): Update. (attach_proc_task_lwp_callback, get_detach_signal) (detach_one_lwp, resume_lwp, linux_nat_target::resume) (linux_nat_target::resume, wait_lwp, stop_callback) (maybe_clear_ignore_sigint, stop_wait_callback, status_callback) (save_stop_reason, select_event_lwp, linux_nat_filter_event) (linux_nat_wait_1, resume_stopped_resumed_lwps) (linux_nat_target::wait, linux_nat_stop_lwp): Update. * inf-ptrace.c (inf_ptrace_target::pid_to_str): Change return type. (inf_ptrace_target::attach): Update. (inf_ptrace_target::files_info): Update. * go32-nat.c (struct go32_nat_target) <pid_to_str>: Change return type. (go32_nat_target::pid_to_str): Change return type. * gnu-nat.c (gnu_nat_target::pid_to_str): Change return type. (gnu_nat_target::wait): Update. (gnu_nat_target::wait): Update. (gnu_nat_target::resume): Update. * fbsd-nat.c (fbsd_nat_target::pid_to_str): Change return type. (fbsd_nat_target::wait): Update. * darwin-nat.c (darwin_nat_target::pid_to_str): Change return type. (darwin_nat_target::attach): Update. * corelow.c (class core_target) <pid_to_str>: Change return type. (core_target::pid_to_str): Change return type. * target.c (normal_pid_to_str): Change return type. (default_pid_to_str): Likewise. (target_pid_to_str): Change return type. (target_translate_tls_address): Update. (target_announce_detach): Update. * bsd-uthread.c (struct bsd_uthread_target) <pid_to_str>: Change return type. (bsd_uthread_target::pid_to_str): Change return type. * bsd-kvm.c (class bsd_kvm_target) <pid_to_str>: Change return type. (bsd_kvm_target::pid_to_str): Change return type. * aix-thread.c (class aix_thread_target) <pid_to_str>: Change return type. (aix_thread_target::pid_to_str): Change return type. * target.h (struct target_ops) <pid_to_str>: Change return type. (target_pid_to_str, normal_pid_to_str): Likewise. * obsd-nat.h (class obsd_nat_target) <pid_to_str>: Change return type. * linux-nat.h (class linux_nat_target) <pid_to_str>: Change return type. * inf-ptrace.h (struct inf_ptrace_target) <pid_to_str>: Change return type. * gnu-nat.h (struct gnu_nat_target) <pid_to_str>: Change return type. * fbsd-nat.h (class fbsd_nat_target) <pid_to_str>: Change return type. * darwin-nat.h (class darwin_nat_target) <pid_to_str>: Change return type.
154 lines
5.2 KiB
C++
154 lines
5.2 KiB
C++
/* Common things used by the various *gnu-nat.c files
|
|
Copyright (C) 1995-2019 Free Software Foundation, Inc.
|
|
|
|
Written by Miles Bader <miles@gnu.ai.mit.edu>
|
|
|
|
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/>. */
|
|
|
|
#ifndef GNU_NAT_H
|
|
#define GNU_NAT_H
|
|
|
|
#include "defs.h"
|
|
|
|
/* Work around conflict between Mach's 'thread_info' function, and GDB's
|
|
'thread_info' class. Make the former available as 'mach_thread_info'. */
|
|
#define thread_info mach_thread_info
|
|
/* Mach headers are not yet ready for C++ compilation. */
|
|
extern "C"
|
|
{
|
|
#include <mach.h>
|
|
}
|
|
#undef thread_info
|
|
/* Divert 'mach_thread_info' to the original Mach 'thread_info' function. */
|
|
extern __typeof__ (mach_thread_info) mach_thread_info asm ("thread_info");
|
|
|
|
#include <unistd.h>
|
|
|
|
#include "inf-child.h"
|
|
|
|
struct inf;
|
|
|
|
extern struct inf *gnu_current_inf;
|
|
|
|
/* Converts a GDB pid to a struct proc. */
|
|
struct proc *inf_tid_to_thread (struct inf *inf, int tid);
|
|
|
|
typedef void (inf_threads_ftype) (struct proc *thread, void *arg);
|
|
|
|
/* Call F for every thread in inferior INF, passing ARG as second parameter. */
|
|
void inf_threads (struct inf *inf, inf_threads_ftype *f, void *arg);
|
|
|
|
/* Makes sure that INF's thread list is synced with the actual process. */
|
|
int inf_update_procs (struct inf *inf);
|
|
|
|
/* A proc is either a thread, or the task (there can only be one task proc
|
|
because it always has the same TID, PROC_TID_TASK). */
|
|
struct proc
|
|
{
|
|
thread_t port; /* The task or thread port. */
|
|
int tid; /* The GDB pid (actually a thread id). */
|
|
int num; /* An id number for threads, to print. */
|
|
|
|
mach_port_t saved_exc_port; /* The task/thread's real exception port. */
|
|
mach_port_t exc_port; /* Our replacement, which for. */
|
|
|
|
int sc; /* Desired suspend count. */
|
|
int cur_sc; /* Implemented suspend count. */
|
|
int run_sc; /* Default sc when the program is running. */
|
|
int pause_sc; /* Default sc when gdb has control. */
|
|
int resume_sc; /* Sc resulting from the last resume. */
|
|
int detach_sc; /* SC to leave around when detaching
|
|
from program. */
|
|
|
|
thread_state_data_t state; /* Registers, &c. */
|
|
int state_valid:1; /* True if STATE is up to date. */
|
|
int state_changed:1;
|
|
|
|
int aborted:1; /* True if thread_abort has been called. */
|
|
int dead:1; /* We happen to know it's actually dead. */
|
|
|
|
/* Bit mask of registers fetched by gdb. This is used when we re-fetch
|
|
STATE after aborting the thread, to detect that gdb may have out-of-date
|
|
information. */
|
|
unsigned long fetched_regs;
|
|
|
|
struct inf *inf; /* Where we come from. */
|
|
|
|
struct proc *next;
|
|
};
|
|
|
|
/* The task has a thread entry with this TID. */
|
|
#define PROC_TID_TASK (-1)
|
|
|
|
#define proc_is_task(proc) ((proc)->tid == PROC_TID_TASK)
|
|
#define proc_is_thread(proc) ((proc)->tid != PROC_TID_TASK)
|
|
|
|
extern int __proc_pid (struct proc *proc);
|
|
|
|
/* Make sure that the state field in PROC is up to date, and return a
|
|
pointer to it, or 0 if something is wrong. If WILL_MODIFY is true,
|
|
makes sure that the thread is stopped and aborted first, and sets
|
|
the state_changed field in PROC to true. */
|
|
extern thread_state_t proc_get_state (struct proc *proc, int will_modify);
|
|
|
|
/* Return printable description of proc. */
|
|
extern char *proc_string (struct proc *proc);
|
|
|
|
#define proc_debug(_proc, msg, args...) \
|
|
do { struct proc *__proc = (_proc); \
|
|
debug ("{proc %d/%d %s}: " msg, \
|
|
__proc_pid (__proc), __proc->tid, \
|
|
host_address_to_string (__proc) , ##args); } while (0)
|
|
|
|
extern int gnu_debug_flag;
|
|
|
|
#define debug(msg, args...) \
|
|
do { if (gnu_debug_flag) \
|
|
fprintf_unfiltered (gdb_stdlog, "%s:%d: " msg "\r\n", \
|
|
__FILE__ , __LINE__ , ##args); } while (0)
|
|
|
|
/* A prototype generic GNU/Hurd target. The client can override it
|
|
with local methods. */
|
|
|
|
struct gnu_nat_target : public inf_child_target
|
|
{
|
|
void attach (const char *, int) override;
|
|
bool attach_no_wait () override
|
|
{ return true; }
|
|
|
|
void detach (inferior *, int) override;
|
|
void resume (ptid_t, int, enum gdb_signal) override;
|
|
|
|
ptid_t wait (ptid_t, struct target_waitstatus *, int) override;
|
|
enum target_xfer_status xfer_partial (enum target_object object,
|
|
const char *annex,
|
|
gdb_byte *readbuf,
|
|
const gdb_byte *writebuf,
|
|
ULONGEST offset, ULONGEST len,
|
|
ULONGEST *xfered_len) override;
|
|
|
|
int find_memory_regions (find_memory_region_ftype func, void *data)
|
|
override;
|
|
void kill () override;
|
|
|
|
void create_inferior (const char *, const std::string &,
|
|
char **, int) override;
|
|
void mourn_inferior () override;
|
|
bool thread_alive (ptid_t ptid) override;
|
|
std::string pid_to_str (ptid_t) override;
|
|
void stop (ptid_t) override;
|
|
};
|
|
|
|
#endif /* GNU_NAT_H */
|