f8eb6a9e89
Not all of the architecture-specific FreeBSD target files were including the right headers to enable conditionals in fbsd-nat.h after the C++ target conversion. As a result, certain operations like 'info auxv' and 'p $_siginfo' were not working for some native targets (noticed on RISC-V). Fix this in a couple of ways: 1) Declare fbsd_nat_target::xfer_partial unconditionally and only use conditionals in the function body for individual target objects. Originally this function was only used to read the ELF auxiliary vector, so the entire function was conditional on a macro required for that object (KERN_AUXV_PROC). However, xfer_partial has since grown support for additional objects. Making the function unconditional avoids needing to add the right header to fbsd-nat.h and allows each target object to use independent requirements. This did require using a more explicit conditional test for the $_siginfo support. Removing the "outer" KERN_PROC_AUXV test enabled $_siginfo for all kernels with PT_LWPINFO, but some older kernels (FreeBSD 6.0) exposed PT_LWPINFO with a different siginfo format. Instead use an explicit test for when the current siginfo format was adopted (shipped in FreeBSD 7.0). This actually enables $_siginfo on a wider range of kernels as KERN_PROC_AUXV wasn't introduced until FreeBSD 9.1/10.0. 2) Include <sys/proc.h> in fbsd-nat.h for the definition of TDP_RFPPWAIT that governs support for fork following. gdb/ChangeLog: * fbsd-nat.c [__FreeBSD_version >= 700009] (USE_SIGINFO): Macro defined. (union sigval32, struct siginfo32, fbsd_siginfo_size) (fbsd_convert_siginfo): Make conditional on USE_SIGINFO instead of KERN_PROC_AUXV and PT_LWPINFO. (fbsd_nat_target::xfer_partial): Define method unconditionally. Make TARGET_OBJECT_SIGNAL_INFO conditional on USE_SIGINFO. Make TARGET_OBJECT_AUXV conditional on KERN_PROC_AUXV. Make TARGET_OBJECT_FREEBSD_VMMAP and TARGET_OBJECT_FREEBSD_PS_STRINGS conditional on KERN_PROC_VMMAP and KERN_PROC_PS_STRINGS. * fbsd-nat.h: Include <sys/proc.h>. (fbsd_nat_target::xfer_partial): Declare method unconditionally.
100 lines
2.8 KiB
C++
100 lines
2.8 KiB
C++
/* Native-dependent code for FreeBSD.
|
|
|
|
Copyright (C) 2004-2018 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/>. */
|
|
|
|
#ifndef FBSD_NAT_H
|
|
#define FBSD_NAT_H
|
|
|
|
#include "inf-ptrace.h"
|
|
#include <sys/proc.h>
|
|
|
|
#ifdef TRAP_BRKPT
|
|
/* MIPS does not set si_code for SIGTRAP. sparc64 reports
|
|
non-standard values in si_code for SIGTRAP. */
|
|
# if !defined(__mips__) && !defined(__sparc64__)
|
|
# define USE_SIGTRAP_SIGINFO
|
|
# endif
|
|
#endif
|
|
|
|
/* A prototype FreeBSD target. */
|
|
|
|
class fbsd_nat_target : public inf_ptrace_target
|
|
{
|
|
public:
|
|
char *pid_to_exec_file (int pid) override;
|
|
|
|
int find_memory_regions (find_memory_region_ftype func, void *data) override;
|
|
|
|
bool info_proc (const char *, enum info_proc_what) 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;
|
|
|
|
#ifdef PT_LWPINFO
|
|
bool thread_alive (ptid_t ptid) override;
|
|
const char *pid_to_str (ptid_t) override;
|
|
|
|
#ifdef HAVE_STRUCT_PTRACE_LWPINFO_PL_TDNAME
|
|
const char *thread_name (struct thread_info *) override;
|
|
#endif
|
|
|
|
void update_thread_list () override;
|
|
|
|
thread_control_capabilities get_thread_control_capabilities () override
|
|
{ return tc_schedlock; }
|
|
|
|
void resume (ptid_t, int, enum gdb_signal) override;
|
|
|
|
ptid_t wait (ptid_t, struct target_waitstatus *, int) override;
|
|
|
|
void post_startup_inferior (ptid_t) override;
|
|
void post_attach (int) override;
|
|
|
|
#ifdef USE_SIGTRAP_SIGINFO
|
|
bool supports_stopped_by_sw_breakpoint () override;
|
|
bool stopped_by_sw_breakpoint () override;
|
|
#endif
|
|
|
|
#ifdef TDP_RFPPWAIT
|
|
int follow_fork (int, int) override;
|
|
|
|
int insert_fork_catchpoint (int) override;
|
|
int remove_fork_catchpoint (int) override;
|
|
|
|
int insert_vfork_catchpoint (int) override;
|
|
int remove_vfork_catchpoint (int) override;
|
|
#endif
|
|
|
|
#ifdef PL_FLAG_EXEC
|
|
int insert_exec_catchpoint (int) override;
|
|
int remove_exec_catchpoint (int) override;
|
|
#endif
|
|
|
|
#ifdef HAVE_STRUCT_PTRACE_LWPINFO_PL_SYSCALL_CODE
|
|
int set_syscall_catchpoint (int, bool, int, gdb::array_view<const int>)
|
|
override;
|
|
#endif
|
|
#endif /* PT_LWPINFO */
|
|
};
|
|
|
|
#endif /* fbsd-nat.h */
|