diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/Makefile.in | 4 | ||||
| -rw-r--r-- | gdb/amd64obsd-nat.c | 68 | ||||
| -rw-r--r-- | gdb/amd64obsd-tdep.c | 170 | ||||
| -rw-r--r-- | gdb/config/i386/obsd64.mh | 7 | ||||
| -rw-r--r-- | gdb/config/i386/obsd64.mt | 2 | ||||
| -rw-r--r-- | gdb/configure.host | 1 | ||||
| -rw-r--r-- | gdb/configure.tgt | 1 |
8 files changed, 260 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dd5abe7..c38953c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2004-02-18 Mark Kettenis <kettenis@gnu.org> + * amd64obsd-tdep.c, amd64obsd-nat.c: New files. + * Makefile.in (amd64obsd-nat.o, amd64obsd-tdep.o): New + dependencies. + * configure.host: Add x86_64-*-openbsd*. + * configure.tgt: Add x86_64-*-openbsd*. + * config/i386/obsd64.mt, config/i386/obsd64.mh: New files. + * tui/tui.c: Don't include <malloc.h>. * Makefile.in (ALLDEPFILES): Add amd64-nat.c, amd64bsd-nat.c, diff --git a/gdb/Makefile.in b/gdb/Makefile.in index a11c6c8..744a1d4 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1489,6 +1489,10 @@ amd64nbsd-nat.o: amd64nbsd-nat.c $(defs_h) $(gdb_assert_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) +amd64obsd-nat.o: amd64nbsd-nat.c $(defs_h) $(gdb_assert_h) $(x86_64_tdep_h) \ + $(amd64_nat_h) +amd64obsd-tdep.o: amd64nbsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \ + $(gdbcore_h) $(osabi_h) $(gdb_assert_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) $(buildsym_h) \ diff --git a/gdb/amd64obsd-nat.c b/gdb/amd64obsd-nat.c new file mode 100644 index 0000000..5a802d4 --- /dev/null +++ b/gdb/amd64obsd-nat.c @@ -0,0 +1,68 @@ +/* Native-dependent code for OpenBSD/amd64. + + Copyright 2003, 2004 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 OpenBSD/amd64 + `struct reg' format and GDB's register cache layout for + OpenBSD/i386. + + Note that most (if not all) OpenBSD/amd64 registers are 64-bit, + while the OpenBSD/i386 registers are all 32-bit, but since we're + little-endian we get away with that. */ + +/* From <machine/reg.h>. */ +static int amd64obsd32_r_reg_offset[] = +{ + 14 * 8, /* %eax */ + 3 * 8, /* %ecx */ + 2 * 8, /* %edx */ + 13 * 8, /* %ebx */ + 15 * 8, /* %esp */ + 12 * 8, /* %ebp */ + 1 * 8, /* %esi */ + 0 * 8, /* %edi */ + 16 * 8, /* %eip */ + 17 * 8, /* %eflags */ + 18 * 8, /* %cs */ + 19 * 8, /* %ss */ + 20 * 8, /* %ds */ + 21 * 8, /* %es */ + 22 * 8, /* %fs */ + 23 * 8 /* %gs */ +}; + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_amd64obsd_nat (void); + +void +_initialize_amd64obsd_nat (void) +{ + amd64_native_gregset32_reg_offset = amd64obsd32_r_reg_offset; + amd64_native_gregset32_num_regs = ARRAY_SIZE (amd64obsd32_r_reg_offset); + amd64_native_gregset64_reg_offset = amd64obsd_r_reg_offset; +} diff --git a/gdb/amd64obsd-tdep.c b/gdb/amd64obsd-tdep.c new file mode 100644 index 0000000..6ccf39f --- /dev/null +++ b/gdb/amd64obsd-tdep.c @@ -0,0 +1,170 @@ +/* Target-dependent code for OpenBSD/amd64. + + Copyright 2003, 2004 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 "frame.h" +#include "gdbcore.h" +#include "osabi.h" +#include "target.h" + +#include "gdb_assert.h" +#include "gdb_string.h" + +#include "x86-64-tdep.h" + +/* Support for signal handlers. */ + +static const int amd64obsd_page_size = 4096; + +static int +amd64obsd_pc_in_sigtramp (CORE_ADDR pc, char *name) +{ + CORE_ADDR start_pc = (pc & ~(amd64obsd_page_size - 1)); + const char sigreturn[] = + { + 0x48, 0xc7, 0xc0, + 0x67, 0x00, 0x00, 0x00, /* movq $SYS_sigreturn, %rax */ + 0x0f, 0x05 /* syscall */ + }; + char *buf; + + if (name) + return 0; + + /* If we can't read the instructions at START_PC, return zero. */ + buf = alloca (sizeof sigreturn); + if (target_read_memory (start_pc + 0x7, buf, sizeof sigreturn)) + return 0; + + /* Check for sigreturn(2). */ + if (memcmp (buf, sigreturn, sizeof sigreturn)) + return 0; + + return 1; +} + +/* Assuming NEXT_FRAME is for a frame following a BSD sigtramp + routine, return the address of the associated sigcontext structure. */ + +static CORE_ADDR +amd64obsd_sigcontext_addr (struct frame_info *next_frame) +{ + /* The %rsp register points at `struct sigcontext' upon entry of a + signal trampoline. */ + return frame_unwind_register_unsigned (next_frame, X86_64_RSP_REGNUM); +} + +/* OpenBSD 3.5 or later. */ + +/* Mapping between the general-purpose registers in `struct reg' + format and GDB's register cache layout. */ + +/* From <machine/reg.h>. Used for ptrace(2), but not for core dumps. */ +int amd64obsd_r_reg_offset[] = +{ + 14 * 8, /* %rax */ + 13 * 8, /* %rbx */ + 3 * 8, /* %rcx */ + 2 * 8, /* %rdx */ + 1 * 8, /* %rsi */ + 0 * 8, /* %rdi */ + 12 * 8, /* %rbp */ + 15 * 8, /* %rsp */ + 4 * 8, /* %r8 .. */ + 5 * 8, + 6 * 8, + 7 * 8, + 8 * 8, + 9 * 8, + 10 * 8, + 11 * 8, /* ... %r15 */ + 16 * 8, /* %rip */ + 17 * 8, /* %eflags */ + 18 * 8, /* %cs */ + 19 * 8, /* %ss */ + 20 * 8, /* %ds */ + 21 * 8, /* %es */ + 22 * 8, /* %fs */ + 23 * 8 /* %gs */ +}; + +/* From <machine/signal.h>. Also used for core dumps. */ +static int amd64obsd_sc_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 */ + 22 * 8, /* %cs */ + 25 * 8, /* %ss */ + 18 * 8, /* %ds */ + 17 * 8, /* %es */ + 16 * 8, /* %fs */ + 15 * 8 /* %gs */ +}; + +static void +amd64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + /* Initialize general-purpose register set details first. */ + tdep->gregset_reg_offset = amd64obsd_sc_reg_offset; + tdep->gregset_num_regs = ARRAY_SIZE (amd64obsd_sc_reg_offset); + tdep->sizeof_gregset = 26 * 8; + + x86_64_init_abi (info, gdbarch); + + tdep->jb_pc_offset = 7 * 8; + + set_gdbarch_pc_in_sigtramp (gdbarch, amd64obsd_pc_in_sigtramp); + tdep->sigcontext_addr = amd64obsd_sigcontext_addr; + tdep->sc_reg_offset = amd64obsd_sc_reg_offset; + tdep->sc_num_regs = ARRAY_SIZE (amd64obsd_sc_reg_offset); +} + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_amd64obsd_tdep (void); + +void +_initialize_amd64obsd_ndep (void) +{ + /* The OpenBSD/amd64 native dependent code makes this assumption. */ + gdb_assert (ARRAY_SIZE (amd64obsd_r_reg_offset) == X86_64_NUM_GREGS); + + gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64, + GDB_OSABI_OPENBSD_ELF, amd64obsd_init_abi); +} diff --git a/gdb/config/i386/obsd64.mh b/gdb/config/i386/obsd64.mh new file mode 100644 index 0000000..9e196ad --- /dev/null +++ b/gdb/config/i386/obsd64.mh @@ -0,0 +1,7 @@ +# Host: OpenBSD/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 amd64obsd-nat.o diff --git a/gdb/config/i386/obsd64.mt b/gdb/config/i386/obsd64.mt new file mode 100644 index 0000000..821becb --- /dev/null +++ b/gdb/config/i386/obsd64.mt @@ -0,0 +1,2 @@ +# Target: OpenBSD/amd64 +TDEPFILES= x86-64-tdep.o amd64obsd-tdep.o i386-tdep.o i387-tdep.o diff --git a/gdb/configure.host b/gdb/configure.host index 668008b..232decc 100644 --- a/gdb/configure.host +++ b/gdb/configure.host @@ -147,6 +147,7 @@ vax-*-ultrix*) gdb_host=vaxult ;; x86_64-*-linux*) gdb_host=x86-64linux ;; x86_64-*-freebsd*) gdb_host=fbsd64 ;; x86_64-*-netbsd*) gdb_host=nbsd64 ;; +x86_64-*-openbsd*) gdb_host=obsd64 ;; m32r*-*-linux*) gdb_host=linux ;; diff --git a/gdb/configure.tgt b/gdb/configure.tgt index fe1702e..08afd98 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -217,6 +217,7 @@ x86_64-*-linux*) gdb_target=x86-64linux build_gdbserver=yes ;; x86_64-*-netbsd*) gdb_target=nbsd64 ;; +x86_64-*-openbsd*) gdb_target=obsd64 ;; esac |