diff options
| -rw-r--r-- | gdb/ChangeLog | 11 | ||||
| -rw-r--r-- | gdb/Makefile.in | 5 | ||||
| -rw-r--r-- | gdb/amd64fbsd-nat.c | 300 | ||||
| -rw-r--r-- | gdb/amd64fbsd-tdep.c | 108 | ||||
| -rw-r--r-- | gdb/config/i386/fbsd64.mh | 7 | ||||
| -rw-r--r-- | gdb/config/i386/fbsd64.mt | 2 | ||||
| -rw-r--r-- | gdb/config/i386/nm-fbsd64.h | 42 | ||||
| -rw-r--r-- | gdb/configure.host | 1 | ||||
| -rw-r--r-- | gdb/configure.tgt | 2 |
9 files changed, 478 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cfa5e1f..1013883 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2003-07-13 Mark Kettenis <kettenis@gnu.org> + + * configure.host: Add x86_64-*-freebsd*. + * configure.tgt: Add x86_64-*-freebsd*. + * Makefile.in (amd64fbsd-nat.o, amd64fbsd-tdep.o): New targets. + * amd64fbsd-nat.c: New file. + * amd64fbsd-tdep.c: New file. + * config/i386/nm-fbsd64.h: New file. + * config/i386/fbsd64.mh: New file. + * config/i386/fbsd64.mt: New file. + 2003-07-11 Mark Kettenis <kettenis@gnu.org> * alpha-tdep.h (struct gdbarch_tdep): Add members `sc_pc_offset', diff --git a/gdb/Makefile.in b/gdb/Makefile.in index a41af14..7cf0c07 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1529,6 +1529,11 @@ alphafbsd-tdep.o: alphafbsd-tdep.c $(defs_h) $(value_h) $(alpha_tdep_h) \ alphanbsd-tdep.o: alphanbsd-tdep.c $(defs_h) $(gdbcore_h) $(frame_h) \ $(regcache_h) $(value_h) $(solib_svr4_h) $(alpha_tdep_h) \ $(alphabsd_tdep_h) $(nbsd_tdep_h) $(osabi_h) +amd64fbsd-nat.o: amd64fbsd-nat.o $(defs_h) $(inferior_h) $(regcache_h) \ + $(gdb_assert_h) $(gregset_h) $(x86_64_tdep_h) +amd64fbsd-tdep.o: amd64fbsd-tdep.o $(defs_h) $(arch_utils_h) $(frame_h) \ + $(gdbcore_h) $(regcache_h) $(osabi_h) $(gdb_string_h) \ + $(x86_64_tdep_h) annotate.o: annotate.c $(defs_h) $(annotate_h) $(value_h) $(target_h) \ $(gdbtypes_h) $(breakpoint_h) arch-utils.o: arch-utils.c $(defs_h) $(arch_utils_h) $(gdbcmd_h) \ diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c new file mode 100644 index 0000000..7880e58 --- /dev/null +++ b/gdb/amd64fbsd-nat.c @@ -0,0 +1,300 @@ +/* Native-dependent code for FreeBSD/amd64. + Copyright 2003 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 2 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "defs.h" +#include "inferior.h" +#include "regcache.h" + +#include "gdb_assert.h" +#include <signal.h> +#include <stddef.h> +#include <sys/types.h> +#include <sys/ptrace.h> +#include <sys/sysctl.h> +#include <machine/reg.h> + +#ifdef HAVE_SYS_PROCFS_H +#include <sys/procfs.h> +#endif + +#ifndef HAVE_GREGSET_T +typedef struct reg gregset_t; +#endif + +#ifndef HAVE_FPREGSET_T +typedef struct fpreg fpregset_t; +#endif + +#include "gregset.h" +#include "x86-64-tdep.h" + + +/* Offset to the gregset_t location where REG is stored. */ +#define REG_OFFSET(reg) offsetof (gregset_t, reg) + +/* At reg_offset[REGNO] you'll find the offset to the gregset_t + location where the GDB register REGNO is stored. Unsupported + registers are marked with `-1'. */ +static int reg_offset[] = +{ + REG_OFFSET (r_rax), + REG_OFFSET (r_rbx), + REG_OFFSET (r_rcx), + REG_OFFSET (r_rdx), + REG_OFFSET (r_rsi), + REG_OFFSET (r_rdi), + REG_OFFSET (r_rbp), + REG_OFFSET (r_rsp), + REG_OFFSET (r_r8), + REG_OFFSET (r_r9), + REG_OFFSET (r_r10), + REG_OFFSET (r_r11), + REG_OFFSET (r_r12), + REG_OFFSET (r_r13), + REG_OFFSET (r_r14), + REG_OFFSET (r_r15), + REG_OFFSET (r_rip), + REG_OFFSET (r_rflags), + -1, + -1, + -1, + -1 +}; + +#define REG_ADDR(regset, regno) ((char *) (regset) + reg_offset[regno]) + +/* Macro to determine if a register is fetched with PT_GETREGS. */ +#define GETREGS_SUPPLIES(regno) \ + ((0 <= (regno) && (regno) < X86_64_NUM_GREGS)) + + +/* Transfering the registers between GDB, inferiors and core files. */ + +/* Fill GDB's register array with the general-purpose register values + in *GREGSETP. */ + +void +supply_gregset (gregset_t *gregsetp) +{ + int i; + + for (i = 0; i < X86_64_NUM_GREGS; i++) + { + if (reg_offset[i] == -1) + supply_register (i, NULL); + else + supply_register (i, REG_ADDR (gregsetp, i)); + } +} + +/* Fill register REGNO (if it is a general-purpose register) in + *GREGSETPS with the value in GDB's register array. If REGNO is -1, + do this for all registers. */ + +void +fill_gregset (gregset_t *gregsetp, int regno) +{ + int i; + + for (i = 0; i < X86_64_NUM_GREGS; i++) + if ((regno == -1 || regno == i) && reg_offset[i] != -1) + regcache_collect (i, REG_ADDR (gregsetp, i)); +} + +/* Fill GDB's register array with the floating-point register values + in *FPREGSETP. */ + +void +supply_fpregset (fpregset_t *fpregsetp) +{ + x86_64_supply_fxsave ((char *) fpregsetp); +} + +/* Fill register REGNO (if it is a floating-point register) in + *FPREGSETP with the value in GDB's register array. If REGNO is -1, + do this for all registers. */ + +void +fill_fpregset (fpregset_t *fpregsetp, int regno) +{ + x86_64_fill_fxsave ((char *) fpregsetp, regno); +} + +/* Fetch register REGNO from the inferior. If REGNO is -1, do this + for all registers (including the floating point registers). */ + +void +fetch_inferior_registers (int regno) +{ + if (regno == -1 || GETREGS_SUPPLIES (regno)) + { + gregset_t gregs; + + if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &gregs, 0) == -1) + perror_with_name ("Couldn't get registers"); + + supply_gregset (&gregs); + if (regno != -1) + return; + } + + if (regno == -1 || regno >= FP0_REGNUM) + { + fpregset_t fpregs; + + if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't get floating point status"); + + supply_fpregset (&fpregs); + } +} + +/* Store register REGNO back into the inferior. If REGNO is -1, do + this for all registers (including the floating point registers). */ + +void +store_inferior_registers (int regno) +{ + if (regno == -1 || GETREGS_SUPPLIES (regno)) + { + gregset_t gregs; + + if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &gregs, 0) == -1) + perror_with_name ("Couldn't get registers"); + + fill_gregset (&gregs, regno); + + if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &gregs, 0) == -1) + perror_with_name ("Couldn't write registers"); + + if (regno != -1) + return; + } + + if (regno == -1 || regno >= FP0_REGNUM) + { + fpregset_t fpregs; + + if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't get floating point status"); + + fill_fpregset (&fpregs, regno); + + if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't write floating point status"); + } +} + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_amd64fbsd_nat (void); + +void +_initialize_am64fbsd_nat (void) +{ + int offset; + + /* To support the recognition of signal handlers, i386bsd-tdep.c + hardcodes some constants. Inclusion of this file means that we + are compiling a native debugger, which means that we can use the + system header files and sysctl(3) to get at the relevant + information. */ + + extern int amd64fbsd_sc_reg_offset[]; +#define SC_REG_OFFSET amd64fbsd_sc_reg_offset + + /* We only check the program counter, stack pointer and frame + pointer since these members of `struct sigcontext' are essential + for providing backtraces. */ + +#define SC_RIP_OFFSET SC_REG_OFFSET[X86_64_RIP_REGNUM] +#define SC_RSP_OFFSET SC_REG_OFFSET[X86_64_RSP_REGNUM] +#define SC_RBP_OFFSET SC_REG_OFFSET[X86_64_RBP_REGNUM] + + /* Override the default value for the offset of the program counter + in the sigcontext structure. */ + offset = offsetof (struct sigcontext, sc_rip); + + if (SC_RIP_OFFSET != offset) + { + warning ("\ +offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n\ +Please report this to <bug-gdb@gnu.org>.", + offset, SC_RIP_OFFSET); + } + + SC_RIP_OFFSET = offset; + + /* Likewise for the stack pointer. */ + offset = offsetof (struct sigcontext, sc_rsp); + + if (SC_RSP_OFFSET != offset) + { + warning ("\ +offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n\ +Please report this to <bug-gdb@gnu.org>.", + offset, SC_RSP_OFFSET); + } + + SC_RSP_OFFSET = offset; + + /* And the frame pointer. */ + offset = offsetof (struct sigcontext, sc_rbp); + + if (SC_RBP_OFFSET != offset) + { + warning ("\ +offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n\ +Please report this to <bug-gdb@gnu.org>.", + offset, SC_RBP_OFFSET); + } + + SC_RBP_OFFSET = offset; + + /* FreeBSD provides a kern.ps_strings sysctl that we can use to + locate the sigtramp. That way we can still recognize a sigtramp + if its location is changed in a new kernel. Of course this is + still based on the assumption that the sigtramp is placed + directly under the location where the program arguments and + environment can be found. */ + { + int mib[2]; + int ps_strings; + size_t len; + + extern CORE_ADDR amd64fbsd_sigtramp_start; + extern CORE_ADDR amd64fbsd_sigtramp_end; + + mib[0] = CTL_KERN; + mib[1] = KERN_PS_STRINGS; + len = sizeof (ps_strings); + if (sysctl (mib, 2, &ps_strings, &len, NULL, 0) == 0) + { + amd64fbsd_sigtramp_start = ps_strings - 32; + amd64fbsd_sigtramp_end = ps_strings; + } + } +} diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c new file mode 100644 index 0000000..e72c140 --- /dev/null +++ b/gdb/amd64fbsd-tdep.c @@ -0,0 +1,108 @@ +/* Target-dependent code for FreeBSD/amd64. + Copyright 2003 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 2 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "defs.h" +#include "arch-utils.h" +#include "frame.h" +#include "gdbcore.h" +#include "regcache.h" +#include "osabi.h" + +#include "gdb_string.h" + +#include "x86-64-tdep.h" + +/* Support for signal handlers. */ + +/* Assuming NEXT_FRAME is for a frame following a BSD sigtramp + routine, return the address of the associated sigcontext structure. */ + +static CORE_ADDR +amd64fbsd_sigcontext_addr (struct frame_info *next_frame) +{ + char buf[8]; + CORE_ADDR sp; + + frame_unwind_register (next_frame, X86_64_RSP_REGNUM, buf); + sp = extract_unsigned_integer (buf, 8); + + return read_memory_unsigned_integer (sp + 16, 8); +} + +/* FreeBSD 5.1-RELEASE or later. */ + +/* Location of the signal trampoline. */ +CORE_ADDR amd64fbsd_sigtramp_start = 0x7fffffffc0; +CORE_ADDR amd64fbsd_sigtramp_end = 0x7fffffffe0; + +/* From <machine/signal.h>. */ +int amd64fbsd_sc_reg_offset[X86_64_NUM_GREGS] = +{ + 24 + 14 * 8, /* %rax */ + 24 + 11 * 8, /* %rbx */ + 24 + 13 * 8, /* %rcx */ + 24 + 12 * 8, /* %rdx */ + 24 + 9 * 8, /* %rsi */ + 24 + 8 * 8, /* %rdi */ + 24 + 10 * 8, /* %rbp */ + 24 + 20 * 8, /* %rsp */ + 24 + 7 * 8, /* %r8 */ + 24 + 6 * 8, /* %r9 */ + 24 + 5 * 8, /* %r10 */ + 24 + 4 * 8, /* %r11 */ + 24 + 3 * 8, /* %r12 */ + 24 + 2 * 8, /* %r13 */ + 24 + 1 * 8, /* %r14 */ + 24 + 0 * 8, /* %r15 */ + 24 + 17 * 8, /* %rip */ + 24 + 19 * 8, /* %eflags */ + -1, /* %ds */ + -1, /* %es */ + -1, /* %fs */ + -1 /* %gs */ +}; + +void +amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + /* Obviously FreeBSD is BSD-based. */ + i386bsd_init_abi (info, gdbarch); + + x86_64_init_abi (info, gdbarch); + + tdep->sigtramp_start = amd64fbsd_sigtramp_start; + tdep->sigtramp_end = amd64fbsd_sigtramp_start; + tdep->sigcontext_addr = amd64fbsd_sigcontext_addr; + tdep->sc_reg_offset = amd64fbsd_sc_reg_offset; + tdep->sc_num_regs = X86_64_NUM_GREGS; +} + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_amd64fbsd_tdep (void); + +void +_initialize_amd64fbsd_tdep (void) +{ + gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64, + GDB_OSABI_FREEBSD_ELF, amd64fbsd_init_abi); +} diff --git a/gdb/config/i386/fbsd64.mh b/gdb/config/i386/fbsd64.mh new file mode 100644 index 0000000..a1a79a3 --- /dev/null +++ b/gdb/config/i386/fbsd64.mh @@ -0,0 +1,7 @@ +# Host: FreeBSD/amd64 + +XM_FILE= xm-i386.h + +NAT_FILE= nm-fbsd64.h +# NOTE: Do not spread NATDEPFILES over several lines - it hurts BSD make. +NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o solib-svr4.o solib-legacy.o corelow.o core-regset.o amd64fbsd-nat.o gcore.o fbsd-proc.o diff --git a/gdb/config/i386/fbsd64.mt b/gdb/config/i386/fbsd64.mt new file mode 100644 index 0000000..ae4fe98 --- /dev/null +++ b/gdb/config/i386/fbsd64.mt @@ -0,0 +1,2 @@ +# Target: FreeBSD/amd64 +TDEPFILES= x86-64-tdep.o amd64fbsd-tdep.o i386-tdep.o i387-tdep.o i386bsd-tdep.o diff --git a/gdb/config/i386/nm-fbsd64.h b/gdb/config/i386/nm-fbsd64.h new file mode 100644 index 0000000..e5b66df --- /dev/null +++ b/gdb/config/i386/nm-fbsd64.h @@ -0,0 +1,42 @@ +/* Native-dependent definitions for FreeBSD/amd64. + Copyright 2003 + 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 2 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef NM_FBSD64_H +#define NM_FBSD64_H + +/* Type of the third argument to the `ptrace' system call. */ +#define PTRACE_ARG3_TYPE caddr_t + +/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ +#define FETCH_INFERIOR_REGISTERS + +/* Override child_pid_to_exec_file in 'inftarg.c'. */ +#define CHILD_PID_TO_EXEC_FILE + +/* We can attach and detach. */ +#define ATTACH_DETACH + + +/* Shared library support. */ + +#include "solib.h" + +#endif /* nm-fbsd64.h */ diff --git a/gdb/configure.host b/gdb/configure.host index 41f6d8a..b801589 100644 --- a/gdb/configure.host +++ b/gdb/configure.host @@ -151,5 +151,6 @@ vax-*-ultrix2*) gdb_host=vaxult2 ;; vax-*-ultrix*) gdb_host=vaxult ;; x86_64-*-linux*) gdb_host=x86-64linux ;; +x86_64-*-freebsd*) gdb_host=fbsd64 ;; esac diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 21945c5..14dedbe 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -37,6 +37,7 @@ esac case "${target}" in +x86_64-*-freebsd*) gdb_target=fbsd64 ;; *-*-freebsd*) gdb_target=fbsd ;; @@ -264,6 +265,7 @@ esac case "${gdb_target}" in d10v) gdb_multi_arch=yes ;; +fbsd64) gdb_multi_arch=yes ;; m68hc11) gdb_multi_arch=yes ;; mn10300) gdb_multi_arch=yes ;; x86-64linux) gdb_multi_arch=yes ;; |