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.
263 lines
6.8 KiB
C
263 lines
6.8 KiB
C
/* Target-dependent code for Cygwin running on i386's, for GDB.
|
|
|
|
Copyright (C) 2003-2019 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 "osabi.h"
|
|
#include "i386-tdep.h"
|
|
#include "windows-tdep.h"
|
|
#include "regset.h"
|
|
#include "gdb_obstack.h"
|
|
#include "xml-support.h"
|
|
#include "gdbcore.h"
|
|
#include "inferior.h"
|
|
|
|
/* Core file support. */
|
|
|
|
/* This vector maps GDB's idea of a register's number into an address
|
|
in the windows exception context vector. */
|
|
|
|
static int i386_windows_gregset_reg_offset[] =
|
|
{
|
|
176, /* eax */
|
|
172, /* ecx */
|
|
168, /* edx */
|
|
164, /* ebx */
|
|
|
|
196, /* esp */
|
|
180, /* ebp */
|
|
160, /* esi */
|
|
156, /* edi */
|
|
|
|
184, /* eip */
|
|
192, /* eflags */
|
|
188, /* cs */
|
|
200, /* ss */
|
|
|
|
152, /* ds */
|
|
148, /* es */
|
|
144, /* fs */
|
|
140, /* gs */
|
|
|
|
56, /* FloatSave.RegisterArea[0 * 10] */
|
|
66, /* FloatSave.RegisterArea[1 * 10] */
|
|
76, /* FloatSave.RegisterArea[2 * 10] */
|
|
86, /* FloatSave.RegisterArea[3 * 10] */
|
|
96, /* FloatSave.RegisterArea[4 * 10] */
|
|
106, /* FloatSave.RegisterArea[5 * 10] */
|
|
116, /* FloatSave.RegisterArea[6 * 10] */
|
|
126, /* FloatSave.RegisterArea[7 * 10] */
|
|
|
|
28, /* FloatSave.ControlWord */
|
|
32, /* FloatSave.StatusWord */
|
|
36, /* FloatSave.TagWord */
|
|
44, /* FloatSave.ErrorSelector */
|
|
40, /* FloatSave.ErrorOffset */
|
|
52, /* FloatSave.DataSelector */
|
|
48, /* FloatSave.DataOffset */
|
|
44, /* FloatSave.ErrorSelector */
|
|
|
|
/* XMM0-7 */
|
|
364, /* ExtendedRegisters[10*16] */
|
|
380, /* ExtendedRegisters[11*16] */
|
|
396, /* ExtendedRegisters[12*16] */
|
|
412, /* ExtendedRegisters[13*16] */
|
|
428, /* ExtendedRegisters[14*16] */
|
|
444, /* ExtendedRegisters[15*16] */
|
|
460, /* ExtendedRegisters[16*16] */
|
|
476, /* ExtendedRegisters[17*16] */
|
|
|
|
/* MXCSR */
|
|
228 /* ExtendedRegisters[24] */
|
|
};
|
|
|
|
#define I386_WINDOWS_SIZEOF_GREGSET 716
|
|
|
|
struct cpms_data
|
|
{
|
|
struct gdbarch *gdbarch;
|
|
struct obstack *obstack;
|
|
int module_count;
|
|
};
|
|
|
|
static void
|
|
core_process_module_section (bfd *abfd, asection *sect, void *obj)
|
|
{
|
|
struct cpms_data *data = (struct cpms_data *) obj;
|
|
enum bfd_endian byte_order = gdbarch_byte_order (data->gdbarch);
|
|
|
|
char *module_name;
|
|
size_t module_name_size;
|
|
CORE_ADDR base_addr;
|
|
|
|
gdb_byte *buf = NULL;
|
|
|
|
if (!startswith (sect->name, ".module"))
|
|
return;
|
|
|
|
buf = (gdb_byte *) xmalloc (bfd_get_section_size (sect) + 1);
|
|
if (!buf)
|
|
{
|
|
printf_unfiltered ("memory allocation failed for %s\n", sect->name);
|
|
goto out;
|
|
}
|
|
if (!bfd_get_section_contents (abfd, sect,
|
|
buf, 0, bfd_get_section_size (sect)))
|
|
goto out;
|
|
|
|
|
|
|
|
/* A DWORD (data_type) followed by struct windows_core_module_info. */
|
|
|
|
base_addr =
|
|
extract_unsigned_integer (buf + 4, 4, byte_order);
|
|
|
|
module_name_size =
|
|
extract_unsigned_integer (buf + 8, 4, byte_order);
|
|
|
|
if (12 + module_name_size > bfd_get_section_size (sect))
|
|
goto out;
|
|
module_name = (char *) buf + 12;
|
|
|
|
/* The first module is the .exe itself. */
|
|
if (data->module_count != 0)
|
|
windows_xfer_shared_library (module_name, base_addr,
|
|
data->gdbarch, data->obstack);
|
|
data->module_count++;
|
|
|
|
out:
|
|
if (buf)
|
|
xfree (buf);
|
|
return;
|
|
}
|
|
|
|
static ULONGEST
|
|
windows_core_xfer_shared_libraries (struct gdbarch *gdbarch,
|
|
gdb_byte *readbuf,
|
|
ULONGEST offset, ULONGEST len)
|
|
{
|
|
struct obstack obstack;
|
|
const char *buf;
|
|
ULONGEST len_avail;
|
|
struct cpms_data data = { gdbarch, &obstack, 0 };
|
|
|
|
obstack_init (&obstack);
|
|
obstack_grow_str (&obstack, "<library-list>\n");
|
|
bfd_map_over_sections (core_bfd,
|
|
core_process_module_section,
|
|
&data);
|
|
obstack_grow_str0 (&obstack, "</library-list>\n");
|
|
|
|
buf = (const char *) obstack_finish (&obstack);
|
|
len_avail = strlen (buf);
|
|
if (offset >= len_avail)
|
|
return 0;
|
|
|
|
if (len > len_avail - offset)
|
|
len = len_avail - offset;
|
|
memcpy (readbuf, buf + offset, len);
|
|
|
|
obstack_free (&obstack, NULL);
|
|
return len;
|
|
}
|
|
|
|
/* This is how we want PTIDs from core files to be printed. */
|
|
|
|
static std::string
|
|
i386_windows_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid)
|
|
{
|
|
if (ptid.lwp () != 0)
|
|
return string_printf ("Thread 0x%lx", ptid.lwp ());
|
|
|
|
return normal_pid_to_str (ptid);
|
|
}
|
|
|
|
static CORE_ADDR
|
|
i386_cygwin_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
|
|
{
|
|
return i386_pe_skip_trampoline_code (frame, pc, NULL);
|
|
}
|
|
|
|
static const char *
|
|
i386_cygwin_auto_wide_charset (void)
|
|
{
|
|
return "UTF-16";
|
|
}
|
|
|
|
static void
|
|
i386_cygwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
|
{
|
|
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
|
|
windows_init_abi (info, gdbarch);
|
|
|
|
set_gdbarch_skip_trampoline_code (gdbarch, i386_cygwin_skip_trampoline_code);
|
|
|
|
set_gdbarch_skip_main_prologue (gdbarch, i386_skip_main_prologue);
|
|
|
|
tdep->struct_return = reg_struct_return;
|
|
|
|
tdep->gregset_reg_offset = i386_windows_gregset_reg_offset;
|
|
tdep->gregset_num_regs = ARRAY_SIZE (i386_windows_gregset_reg_offset);
|
|
tdep->sizeof_gregset = I386_WINDOWS_SIZEOF_GREGSET;
|
|
|
|
tdep->sizeof_fpregset = 0;
|
|
|
|
/* Core file support. */
|
|
set_gdbarch_core_xfer_shared_libraries
|
|
(gdbarch, windows_core_xfer_shared_libraries);
|
|
set_gdbarch_core_pid_to_str (gdbarch, i386_windows_core_pid_to_str);
|
|
|
|
set_gdbarch_auto_wide_charset (gdbarch, i386_cygwin_auto_wide_charset);
|
|
}
|
|
|
|
static enum gdb_osabi
|
|
i386_cygwin_osabi_sniffer (bfd *abfd)
|
|
{
|
|
char *target_name = bfd_get_target (abfd);
|
|
|
|
if (strcmp (target_name, "pei-i386") == 0)
|
|
return GDB_OSABI_CYGWIN;
|
|
|
|
/* Cygwin uses elf core dumps. Do not claim all ELF executables,
|
|
check whether there is a .reg section of proper size. */
|
|
if (strcmp (target_name, "elf32-i386") == 0)
|
|
{
|
|
asection *section = bfd_get_section_by_name (abfd, ".reg");
|
|
if (section
|
|
&& bfd_section_size (abfd, section) == I386_WINDOWS_SIZEOF_GREGSET)
|
|
return GDB_OSABI_CYGWIN;
|
|
}
|
|
|
|
return GDB_OSABI_UNKNOWN;
|
|
}
|
|
|
|
void
|
|
_initialize_i386_cygwin_tdep (void)
|
|
{
|
|
gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_coff_flavour,
|
|
i386_cygwin_osabi_sniffer);
|
|
|
|
/* Cygwin uses elf core dumps. */
|
|
gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_elf_flavour,
|
|
i386_cygwin_osabi_sniffer);
|
|
|
|
gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_CYGWIN,
|
|
i386_cygwin_init_abi);
|
|
}
|