From cced5e27e61ec91c00eecd61b48096f7e49b7141 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sat, 18 Oct 2003 18:41:22 +0000 Subject: [PATCH] Add NetBSD/amd64 native configuration: * x86-64-tdep.h (amd64nbsd_r_reg_offset): Add extern declarations. * amd64nbsd-tdep.c: New file. * amd64nbsd-nat.c: New file. * amd64bsd-nat.c: New file. * config/i386/nbsd64.mh: New file. * config/i386/nbsd64.mt: New file. * configure.host: Add x86_64-*-netbsd*. * configure.tgt: Add x86_64-*-netbsd*. * Makefile.in (amd64bsd-nat.o, amd64nbsd-nat.o, amd64nbsd-tdep.o): New targets. * NEWS (New native configurations): Mention NetBSD/amd64. --- gdb/ChangeLog | 15 +++++ gdb/Makefile.in | 7 +++ gdb/NEWS | 4 ++ gdb/amd64bsd-nat.c | 107 +++++++++++++++++++++++++++++++ gdb/amd64nbsd-nat.c | 68 ++++++++++++++++++++ gdb/amd64nbsd-tdep.c | 129 ++++++++++++++++++++++++++++++++++++++ gdb/config/i386/nbsd64.mh | 7 +++ gdb/config/i386/nbsd64.mt | 2 + gdb/configure.host | 1 + gdb/configure.tgt | 1 + gdb/x86-64-tdep.h | 3 + 11 files changed, 344 insertions(+) create mode 100644 gdb/amd64bsd-nat.c create mode 100644 gdb/amd64nbsd-nat.c create mode 100644 gdb/amd64nbsd-tdep.c create mode 100644 gdb/config/i386/nbsd64.mh create mode 100644 gdb/config/i386/nbsd64.mt diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 84c2094354..43f715658d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,18 @@ +2003-10-18 Mark Kettenis + + Add NetBSD/amd64 native configuration: + * x86-64-tdep.h (amd64nbsd_r_reg_offset): Add extern declarations. + * amd64nbsd-tdep.c: New file. + * amd64nbsd-nat.c: New file. + * amd64bsd-nat.c: New file. + * config/i386/nbsd64.mh: New file. + * config/i386/nbsd64.mt: New file. + * configure.host: Add x86_64-*-netbsd*. + * configure.tgt: Add x86_64-*-netbsd*. + * Makefile.in (amd64bsd-nat.o, amd64nbsd-nat.o, amd64nbsd-tdep.o): + New targets. + * NEWS (New native configurations): Mention NetBSD/amd64. + 2003-10-17 Michael Chastain * config/djgpp/fnchange.lst: Remove dead lines for: diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 8a9e7464f1..d6c88f1236 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1554,11 +1554,18 @@ alpha-tdep.o: alpha-tdep.c $(defs_h) $(doublest_h) $(frame_h) \ $(symfile_h) $(objfiles_h) $(gdb_string_h) $(linespec_h) \ $(regcache_h) $(reggroups_h) $(arch_utils_h) $(osabi_h) $(block_h) \ $(elf_bfd_h) $(alpha_tdep_h) +amd64bsd-nat.o: amd64bsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ + $(gdb_assert_h) $(x86_64_tdep_h) $(amd64_nat_h) amd64fbsd-nat.o: amd64fbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ $(gdb_assert_h) $(gregset_h) $(x86_64_tdep_h) $(amd64_nat_h) +amd64nbsd-nat.o: amd64nbsd-nat.c $(defs_h) $(gdb_assert_h) \ + $(x86_64_tdep_h) $(amd64_nat_h) amd64fbsd-tdep.o: amd64fbsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \ $(gdbcore_h) $(regcache_h) $(osabi_h) $(gdb_string_h) \ $(x86_64_tdep_h) +amd64nbsd-tdep.o: amd64nbsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \ + $(gdbcore_h) $(osabi_h) $(gdb_assert_h) $(nbsd_tdep_h) \ + $(x86_64_tdep_h) amd64-nat.o: amd64-nat.c $(defs_h) $(gdbarch_h) $(regcache_h) \ $(gdb_assert_h) $(i386_tdep_h) $(x86_64_tdep_h) annotate.o: annotate.c $(defs_h) $(annotate_h) $(value_h) $(target_h) \ diff --git a/gdb/NEWS b/gdb/NEWS index 96ba000530..e5bc43d242 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -3,6 +3,10 @@ *** Changes since GDB 6.0: +* New native configurations + +NetBSD/amd64 x86_64-*-netbsd* + * New debugging protocols M32R with SDI protocol m32r-*-elf* diff --git a/gdb/amd64bsd-nat.c b/gdb/amd64bsd-nat.c new file mode 100644 index 0000000000..6c85f20633 --- /dev/null +++ b/gdb/amd64bsd-nat.c @@ -0,0 +1,107 @@ +/* Native-dependent code for AMD64 BSD's. + + 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" + +/* We include to make sure `struct fxsave64' is defined on + NetBSD, since NetBSD's needs it. */ +#include "gdb_assert.h" +#include +#include +#include +#include + +#include "x86-64-tdep.h" +#include "amd64-nat.h" + + +/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this + for all registers (including the floating-point registers). */ + +void +fetch_inferior_registers (int regnum) +{ + if (regnum == -1 || amd64_native_gregset_supplies_p (regnum)) + { + struct reg regs; + + if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) ®s, 0) == -1) + perror_with_name ("Couldn't get registers"); + + amd64_supply_native_gregset (current_regcache, ®s, -1); + if (regnum != -1) + return; + } + + if (regnum == -1 || regnum >= X86_64_ST0_REGNUM) + { + struct fpreg fpregs; + + if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't get floating point status"); + + x86_64_supply_fxsave (current_regcache, -1, &fpregs); + } +} + +/* Store register REGNUM back into the inferior. If REGNUM is -1, do + this for all registers (including the floating-point registers). */ + +void +store_inferior_registers (int regnum) +{ + if (regnum == -1 || amd64_native_gregset_supplies_p (regnum)) + { + struct reg regs; + + if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) ®s, 0) == -1) + perror_with_name ("Couldn't get registers"); + + amd64_collect_native_gregset (current_regcache, ®s, regnum); + + if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) ®s, 0) == -1) + perror_with_name ("Couldn't write registers"); + + if (regnum != -1) + return; + } + + if (regnum == -1 || regnum >= X86_64_ST0_REGNUM) + { + struct fpreg fpregs; + + if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't get floating point status"); + + x86_64_fill_fxsave ((char *) &fpregs, regnum); + + if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) + perror_with_name ("Couldn't write floating point status"); + } +} diff --git a/gdb/amd64nbsd-nat.c b/gdb/amd64nbsd-nat.c new file mode 100644 index 0000000000..4af22feb7f --- /dev/null +++ b/gdb/amd64nbsd-nat.c @@ -0,0 +1,68 @@ +/* Native-dependent code for NetBSD/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 "gdb_assert.h" + +#include "x86-64-tdep.h" +#include "amd64-nat.h" + +/* Mapping between the general-purpose registers in NetBSD/amd64 + `struct reg' format and GDB's register cache layout for + NetBSD/i386. + + Note that most (if not all) NetBSD/amd64 registers are 64-bit, + while the NetBSD/i386 registers are all 32-bit, but since we're + little-endian we get away with that. */ + +/* From . */ +static int amd64nbsd32_r_reg_offset[] = +{ + 14 * 8, /* %eax */ + 3 * 8, /* %ecx */ + 2 * 8, /* %edx */ + 13 * 8, /* %ebx */ + 24 * 8, /* %esp */ + 12 * 8, /* %ebp */ + 1 * 8, /* %esi */ + 0 * 8, /* %edi */ + 21 * 8, /* %eip */ + 23 * 8, /* %eflags */ + -1, /* %cs */ + -1, /* %ss */ + 18 * 8, /* %ds */ + 17 * 8, /* %es */ + 16 * 8, /* %fs */ + 15 * 8 /* %gs */ +}; + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_amd64nbsd_nat (void); + +void +_initialize_amd64nbsd_nat (void) +{ + amd64_native_gregset32_reg_offset = amd64nbsd32_r_reg_offset; + amd64_native_gregset32_num_regs = ARRAY_SIZE (amd64nbsd32_r_reg_offset); + amd64_native_gregset64_reg_offset = amd64nbsd_r_reg_offset; +} diff --git a/gdb/amd64nbsd-tdep.c b/gdb/amd64nbsd-tdep.c new file mode 100644 index 0000000000..5500ed13db --- /dev/null +++ b/gdb/amd64nbsd-tdep.c @@ -0,0 +1,129 @@ +/* Target-dependent code for NetBSD/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 "osabi.h" + +#include "gdb_assert.h" + +#include "nbsd-tdep.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 +amd64nbsd_sigcontext_addr (struct frame_info *next_frame) +{ + CORE_ADDR sp; + + /* The stack pointer points at `struct sigcontext' upon entry of a + signal trampoline. */ + sp = frame_unwind_register_unsigned (next_frame, X86_64_RSP_REGNUM); + return sp; +} + +/* NetBSD 2.0 or later. */ + +/* Mapping between the general-purpose registers in `struct reg' + format and GDB's register cache layout. */ + +/* From . */ +int amd64nbsd_r_reg_offset[] = +{ + 14 * 8, /* %rax */ + 13 * 8, /* %rbx */ + 3 * 8, /* %rcx */ + 2 * 8, /* %rdx */ + 1 * 8, /* %rsi */ + 0 * 8, /* %rdi */ + 12 * 8, /* %rbp */ + 24 * 8, /* %rsp */ + 4 * 8, /* %r8 .. */ + 5 * 8, + 6 * 8, + 7 * 8, + 8 * 8, + 9 * 8, + 10 * 8, + 11 * 8, /* ... %r15 */ + 21 * 8, /* %rip */ + 23 * 8, /* %eflags */ + 18 * 8, /* %ds */ + 17 * 8, /* %es */ + 16 * 8, /* %fs */ + 15 * 8 /* %gs */ +}; + +static void +amd64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + int *sc_reg_offset; + int i; + + /* Initialize general-purpose register set details first. */ + tdep->gregset_reg_offset = amd64nbsd_r_reg_offset; + tdep->gregset_num_regs = ARRAY_SIZE (amd64nbsd_r_reg_offset); + tdep->sizeof_gregset = 26 * 8; + + x86_64_init_abi (info, gdbarch); + + tdep->jb_pc_offset = 7 * 8; + + /* NetBSD has its own convention for signal trampolines. */ + set_gdbarch_pc_in_sigtramp (gdbarch, nbsd_pc_in_sigtramp); + + /* Initialize the array with register offsets in `struct + sigcontext'. This `struct sigcontext' has an sc_mcontext member + at offset 32, and in we have an explicit comment + saying that `struct reg' is the same as mcontext.__gregs. */ + tdep->sc_num_regs = ARRAY_SIZE (amd64nbsd_r_reg_offset); + tdep->sc_reg_offset = XCALLOC (tdep->sc_num_regs, int); + for (i = 0; i < tdep->sc_num_regs; i++) + { + if (amd64nbsd_r_reg_offset[i] < 0) + tdep->sc_reg_offset[i] = -1; + else + tdep->sc_reg_offset[i] = 32 + amd64nbsd_r_reg_offset[i]; + } + + tdep->sigcontext_addr = amd64nbsd_sigcontext_addr; +} + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_amd64nbsd_tdep (void); + +void +_initialize_amd64nbsd_ndep (void) +{ + /* The NetBSD/amd64 native dependent code makes this assumption. */ + gdb_assert (ARRAY_SIZE (amd64nbsd_r_reg_offset) == X86_64_NUM_GREGS); + + gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64, + GDB_OSABI_NETBSD_ELF, amd64nbsd_init_abi); +} diff --git a/gdb/config/i386/nbsd64.mh b/gdb/config/i386/nbsd64.mh new file mode 100644 index 0000000000..5acd1676bb --- /dev/null +++ b/gdb/config/i386/nbsd64.mh @@ -0,0 +1,7 @@ +# Host: NetBSD/amd64 + +XM_FILE= xm-i386.h + +NAT_FILE= nm-nbsd.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 amd64-nat.o amd64bsd-nat.o amd64nbsd-nat.o diff --git a/gdb/config/i386/nbsd64.mt b/gdb/config/i386/nbsd64.mt new file mode 100644 index 0000000000..6d73660fba --- /dev/null +++ b/gdb/config/i386/nbsd64.mt @@ -0,0 +1,2 @@ +# Target: NetBSD/amd64 +TDEPFILES= x86-64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o nbsd-tdep.o diff --git a/gdb/configure.host b/gdb/configure.host index 4e53ef4e45..1c0f9c7004 100644 --- a/gdb/configure.host +++ b/gdb/configure.host @@ -145,5 +145,6 @@ vax-*-ultrix*) gdb_host=vaxult ;; x86_64-*-linux*) gdb_host=x86-64linux ;; x86_64-*-freebsd*) gdb_host=fbsd64 ;; +x86_64-*-netbsd*) gdb_host=nbsd64 ;; esac diff --git a/gdb/configure.tgt b/gdb/configure.tgt index d0743e43ef..fdaf9ec3eb 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -229,6 +229,7 @@ v850*-*-*) gdb_target=v850 x86_64-*-linux*) gdb_target=x86-64linux build_gdbserver=yes ;; +x86_64-*-netbsd*) gdb_target=nbsd64 ;; esac diff --git a/gdb/x86-64-tdep.h b/gdb/x86-64-tdep.h index e800a2f68a..17d2cdfa44 100644 --- a/gdb/x86-64-tdep.h +++ b/gdb/x86-64-tdep.h @@ -65,6 +65,9 @@ extern void x86_64_supply_fxsave (struct regcache *regcache, int regnum, void x86_64_fill_fxsave (char *fxsave, int regnum); +/* Variables exported from amd64nbsd-tdep.c. */ +extern int amd64nbsd_r_reg_offset[]; + /* Variables exported from amd64fbsd-tdep.c. */ extern CORE_ADDR amd64fbsd_sigtramp_start; extern CORE_ADDR amd64fbsd_sigtramp_end;