From 8a96bc77ca647909a8382ae295997bdb7efc63da Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sat, 11 Oct 2003 15:22:39 +0000 Subject: [PATCH] * i386fbsd-tdep.c: New file. (i386fbsd_sigtramp_start, i386fbsd_sigtramp_end, i386fbsd_sc_reg_offset, i386fbsdaout_init_abi, i386fbsd_init_abi, i386fbsd4_sc_reg_offset, i386fbsd4_init_abi): Move here from i386bsd-tdep.c. (_initialize_i386fbsd_tdep): New function. (i386fbsd_r_reg_offset, i386fbsd4_r_reg_offset): New varibles. (i386fbsdaout_init_abi): Initialize TDEP->gregset_reg_offset, TDEP->gregset_num_regs, TDEP->sizeof_gregset and TDEP->sizeof_fpregset. Use ARRAY_SIZE to initialize TDEP->sc_num_regs. (i386fbsd4_init_abi): Initialize TDEP->gregset_reg_offset, TDEP->gregset_num_regs and TDEP->sizeof_gregset. Use ARRAY_SIZE to initialize TDEP->sc_num_regs. * i386bsd-tdep.c (i386fbsd_sigtramp_start, i386fbsd_sigtramp_end, i386fbsd_sc_reg_offset, i386fbsdaout_init_abi, i386fbsd_init_abi, i386fbsd4_sc_reg_offset, i386fbsd4_init_abi): Remove. (_initialize_i386bsd_tdep): Don't register FreeBSD a.out and FreeBSD ELF OS/ABI's here. * Makefile.in (ALLDEPFILES): Add i386fbsd-tdep.c. (i386fbsd-tdep.o): New target. * config/i386/fbsd.mt (TDEPFILES): Add i386fbsd-tdep.o. * config/i386/fbsd64.mt (TDEPFILES): Add i386fbsd-tdep.o. --- gdb/ChangeLog | 24 +++++++ gdb/Makefile.in | 4 +- gdb/config/i386/fbsd.mt | 2 +- gdb/config/i386/fbsd64.mt | 2 +- gdb/i386bsd-tdep.c | 103 +--------------------------- gdb/i386fbsd-tdep.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 201 insertions(+), 105 deletions(-) create mode 100644 gdb/i386fbsd-tdep.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0a4665a..c25ec76 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,29 @@ 2003-10-11 Mark Kettenis + * i386fbsd-tdep.c: New file. + (i386fbsd_sigtramp_start, i386fbsd_sigtramp_end, + i386fbsd_sc_reg_offset, i386fbsdaout_init_abi, i386fbsd_init_abi, + i386fbsd4_sc_reg_offset, i386fbsd4_init_abi): Move here from + i386bsd-tdep.c. + (_initialize_i386fbsd_tdep): New function. + (i386fbsd_r_reg_offset, i386fbsd4_r_reg_offset): New varibles. + (i386fbsdaout_init_abi): Initialize TDEP->gregset_reg_offset, + TDEP->gregset_num_regs, TDEP->sizeof_gregset and + TDEP->sizeof_fpregset. Use ARRAY_SIZE to initialize + TDEP->sc_num_regs. + (i386fbsd4_init_abi): Initialize TDEP->gregset_reg_offset, + TDEP->gregset_num_regs and TDEP->sizeof_gregset. Use ARRAY_SIZE + to initialize TDEP->sc_num_regs. + * i386bsd-tdep.c (i386fbsd_sigtramp_start, i386fbsd_sigtramp_end, + i386fbsd_sc_reg_offset, i386fbsdaout_init_abi, i386fbsd_init_abi, + i386fbsd4_sc_reg_offset, i386fbsd4_init_abi): Remove. + (_initialize_i386bsd_tdep): Don't register FreeBSD a.out and + FreeBSD ELF OS/ABI's here. + * Makefile.in (ALLDEPFILES): Add i386fbsd-tdep.c. + (i386fbsd-tdep.o): New target. + * config/i386/fbsd.mt (TDEPFILES): Add i386fbsd-tdep.o. + * config/i386/fbsd64.mt (TDEPFILES): Add i386fbsd-tdep.o. + * amd64fbsd-tdep.c (amd64fbsd_r_reg_offset): New variable. (amd64fbsd_init_abi): Set TDEP->gregset_reg_offset, TDEP->gregset_num_regs and TDEP->sizeof_gregset. Use ARRAY_SIZE diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 7854d1d..17a7c7a 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1265,7 +1265,7 @@ ALLDEPFILES = \ hppab-nat.c hppah-nat.c hpread.c \ i386-tdep.c i386b-nat.c i386v-nat.c i386-linux-nat.c \ i386v4-nat.c i386ly-tdep.c i386-cygwin-tdep.c \ - i386bsd-nat.c i386bsd-tdep.c i386fbsd-nat.c \ + i386bsd-nat.c i386bsd-tdep.c i386fbsd-nat.c i386fbsd-tdep.c \ i387-tdep.c \ i386-linux-tdep.c i386-nat.c \ i386gnu-nat.c i386gnu-tdep.c \ @@ -1829,6 +1829,8 @@ i386-cygwin-tdep.o: i386-cygwin-tdep.c $(defs_h) $(osabi_h) $(gdb_string_h) \ $(i386_tdep_h) i386fbsd-nat.o: i386fbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ $(i386_tdep_h) +i386fbsd-tdep.o: i386fbsd-tdep.c $(defs_h) $(arch_utils_h) $(osabi_h) \ + $(i386_tdep_h) $(i387_tdep_h) i386gnu-nat.o: i386gnu-nat.c $(defs_h) $(inferior_h) $(floatformat_h) \ $(regcache_h) $(gdb_assert_h) $(i386_tdep_h) $(gnu_nat_h) \ $(i387_tdep_h) $(gregset_h) diff --git a/gdb/config/i386/fbsd.mt b/gdb/config/i386/fbsd.mt index 7a95e00..e339393 100644 --- a/gdb/config/i386/fbsd.mt +++ b/gdb/config/i386/fbsd.mt @@ -1,3 +1,3 @@ # Target: Intel 386 running FreeBSD -TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o +TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o TM_FILE= tm-fbsd.h diff --git a/gdb/config/i386/fbsd64.mt b/gdb/config/i386/fbsd64.mt index ae4fe98..700ffa7 100644 --- a/gdb/config/i386/fbsd64.mt +++ b/gdb/config/i386/fbsd64.mt @@ -1,2 +1,2 @@ # Target: FreeBSD/amd64 -TDEPFILES= x86-64-tdep.o amd64fbsd-tdep.o i386-tdep.o i387-tdep.o i386bsd-tdep.o +TDEPFILES= x86-64-tdep.o amd64fbsd-tdep.o i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o diff --git a/gdb/i386bsd-tdep.c b/gdb/i386bsd-tdep.c index 94d6860..aa3a7e4 100644 --- a/gdb/i386bsd-tdep.c +++ b/gdb/i386bsd-tdep.c @@ -1,4 +1,5 @@ /* Target-dependent code for i386 BSD's. + Copyright 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GDB. @@ -130,103 +131,6 @@ i386bsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->sc_num_regs = I386_NUM_GREGS; } -/* FreeBSD 3.0-RELEASE or later. */ - -CORE_ADDR i386fbsd_sigtramp_start = 0xbfbfdf20; -CORE_ADDR i386fbsd_sigtramp_end = 0xbfbfdff0; - -/* From . */ -int i386fbsd_sc_reg_offset[I386_NUM_GREGS] = -{ - 8 + 14 * 4, /* %eax */ - 8 + 13 * 4, /* %ecx */ - 8 + 12 * 4, /* %edx */ - 8 + 11 * 4, /* %ebx */ - 8 + 0 * 4, /* %esp */ - 8 + 1 * 4, /* %ebp */ - 8 + 10 * 4, /* %esi */ - 8 + 9 * 4, /* %edi */ - 8 + 3 * 4, /* %eip */ - 8 + 4 * 4, /* %eflags */ - 8 + 7 * 4, /* %cs */ - 8 + 8 * 4, /* %ss */ - 8 + 6 * 4, /* %ds */ - 8 + 5 * 4, /* %es */ - 8 + 15 * 4, /* %fs */ - 8 + 16 * 4 /* %gs */ -}; - -static void -i386fbsdaout_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); - - /* FreeBSD uses -freg-struct-return by default. */ - tdep->struct_return = reg_struct_return; - - /* FreeBSD uses a different memory layout. */ - tdep->sigtramp_start = i386fbsd_sigtramp_start; - tdep->sigtramp_end = i386fbsd_sigtramp_end; - - /* FreeBSD has a more complete `struct sigcontext'. */ - tdep->sc_reg_offset = i386fbsd_sc_reg_offset; - tdep->sc_num_regs = I386_NUM_GREGS; -} - -static void -i386fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) -{ - /* It's almost identical to FreeBSD a.out. */ - i386fbsdaout_init_abi (info, gdbarch); - - /* Except that it uses ELF. */ - i386_elf_init_abi (info, gdbarch); - - /* FreeBSD ELF uses SVR4-style shared libraries. */ - set_gdbarch_in_solib_call_trampoline (gdbarch, - generic_in_solib_call_trampoline); -} - -/* FreeBSD 4.0-RELEASE or later. */ - -/* From . */ -int i386fbsd4_sc_reg_offset[I386_NUM_GREGS] = -{ - 20 + 11 * 4, /* %eax */ - 20 + 10 * 4, /* %ecx */ - 20 + 9 * 4, /* %edx */ - 20 + 8 * 4, /* %ebx */ - 20 + 17 * 4, /* %esp */ - 20 + 6 * 4, /* %ebp */ - 20 + 5 * 4, /* %esi */ - 20 + 4 * 4, /* %edi */ - 20 + 14 * 4, /* %eip */ - 20 + 16 * 4, /* %eflags */ - 20 + 15 * 4, /* %cs */ - 20 + 18 * 4, /* %ss */ - 20 + 3 * 4, /* %ds */ - 20 + 2 * 4, /* %es */ - 20 + 1 * 4, /* %fs */ - 20 + 0 * 4 /* %gs */ -}; - -static void -i386fbsd4_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) -{ - struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - - /* Inherit stuff from older releases. We assume that FreeBSD - 4.0-RELEASE always uses ELF. */ - i386fbsd_init_abi (info, gdbarch); - - /* FreeBSD 4.0 introduced a new `struct sigcontext'. */ - tdep->sc_reg_offset = i386fbsd4_sc_reg_offset; - tdep->sc_num_regs = I386_NUM_GREGS; -} - static enum gdb_osabi i386bsd_aout_osabi_sniffer (bfd *abfd) @@ -249,9 +153,4 @@ _initialize_i386bsd_tdep (void) { gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_aout_flavour, i386bsd_aout_osabi_sniffer); - - gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_FREEBSD_AOUT, - i386fbsdaout_init_abi); - gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_FREEBSD_ELF, - i386fbsd4_init_abi); } diff --git a/gdb/i386fbsd-tdep.c b/gdb/i386fbsd-tdep.c new file mode 100644 index 0000000..786de7d --- /dev/null +++ b/gdb/i386fbsd-tdep.c @@ -0,0 +1,171 @@ +/* Target-dependent code for FreeBSD/i386. + + 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 "osabi.h" + +#include "i386-tdep.h" +#include "i387-tdep.h" + +/* FreeBSD 3.0-RELEASE or later. */ + +/* From . */ +static int i386fbsd_r_reg_offset[] = +{ + 9 * 4, 8 * 4, 7 * 4, 6 * 4, /* %eax, %ecx, %edx, %ebx */ + 15 * 4, 4 * 4, /* %esp, %ebp */ + 3 * 4, 2 * 4, /* %esi, %edi */ + 12 * 4, 14 * 4, /* %eip, %eflags */ + 13 * 4, 16 * 4, /* %cs, %ss */ + 1 * 4, 0 * 4, -1, -1 /* %ds, %es, %fs, %gs */ +}; + +CORE_ADDR i386fbsd_sigtramp_start = 0xbfbfdf20; +CORE_ADDR i386fbsd_sigtramp_end = 0xbfbfdff0; + +/* From . */ +static int i386fbsd_sc_reg_offset[] = +{ + 8 + 14 * 4, /* %eax */ + 8 + 13 * 4, /* %ecx */ + 8 + 12 * 4, /* %edx */ + 8 + 11 * 4, /* %ebx */ + 8 + 0 * 4, /* %esp */ + 8 + 1 * 4, /* %ebp */ + 8 + 10 * 4, /* %esi */ + 8 + 9 * 4, /* %edi */ + 8 + 3 * 4, /* %eip */ + 8 + 4 * 4, /* %eflags */ + 8 + 7 * 4, /* %cs */ + 8 + 8 * 4, /* %ss */ + 8 + 6 * 4, /* %ds */ + 8 + 5 * 4, /* %es */ + 8 + 15 * 4, /* %fs */ + 8 + 16 * 4 /* %gs */ +}; + +static void +i386fbsdaout_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); + + /* FreeBSD has a different `struct reg', and reserves some space for + its FPU emulator in `struct fpreg'. */ + tdep->gregset_reg_offset = i386fbsd_r_reg_offset; + tdep->gregset_num_regs = ARRAY_SIZE (i386fbsd_r_reg_offset); + tdep->sizeof_gregset = 18 * 4; + tdep->sizeof_fpregset = 176; + + /* FreeBSD uses -freg-struct-return by default. */ + tdep->struct_return = reg_struct_return; + + /* FreeBSD uses a different memory layout. */ + tdep->sigtramp_start = i386fbsd_sigtramp_start; + tdep->sigtramp_end = i386fbsd_sigtramp_end; + + /* FreeBSD has a more complete `struct sigcontext'. */ + tdep->sc_reg_offset = i386fbsd_sc_reg_offset; + tdep->sc_num_regs = ARRAY_SIZE (i386fbsd_sc_reg_offset); +} + +static void +i386fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + /* It's almost identical to FreeBSD a.out. */ + i386fbsdaout_init_abi (info, gdbarch); + + /* Except that it uses ELF. */ + i386_elf_init_abi (info, gdbarch); + + /* FreeBSD ELF uses SVR4-style shared libraries. */ + set_gdbarch_in_solib_call_trampoline (gdbarch, + generic_in_solib_call_trampoline); +} + +/* FreeBSD 4.0-RELEASE or later. */ + +/* From . */ +static int i386fbsd4_r_reg_offset[] = +{ + 10 * 4, 9 * 4, 8 * 4, 7 * 4, /* %eax, %ecx, %edx, %ebx */ + 16 * 4, 5 * 4, /* %esp, %ebp */ + 4 * 4, 3 * 4, /* %esi, %edi */ + 13 * 4, 15 * 4, /* %eip, %eflags */ + 14 * 4, 17 * 4, /* %cs, %ss */ + 2 * 4, 1 * 4, 0 * 4, 18 * 4 /* %ds, %es, %fs, %gs */ +}; + +/* From . */ +int i386fbsd4_sc_reg_offset[] = +{ + 20 + 11 * 4, /* %eax */ + 20 + 10 * 4, /* %ecx */ + 20 + 9 * 4, /* %edx */ + 20 + 8 * 4, /* %ebx */ + 20 + 17 * 4, /* %esp */ + 20 + 6 * 4, /* %ebp */ + 20 + 5 * 4, /* %esi */ + 20 + 4 * 4, /* %edi */ + 20 + 14 * 4, /* %eip */ + 20 + 16 * 4, /* %eflags */ + 20 + 15 * 4, /* %cs */ + 20 + 18 * 4, /* %ss */ + 20 + 3 * 4, /* %ds */ + 20 + 2 * 4, /* %es */ + 20 + 1 * 4, /* %fs */ + 20 + 0 * 4 /* %gs */ +}; + +static void +i386fbsd4_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + /* Inherit stuff from older releases. We assume that FreeBSD + 4.0-RELEASE always uses ELF. */ + i386fbsd_init_abi (info, gdbarch); + + /* FreeBSD 4.0 introduced a new `struct reg'. */ + tdep->gregset_reg_offset = i386fbsd4_r_reg_offset; + tdep->gregset_num_regs = ARRAY_SIZE (i386fbsd4_r_reg_offset); + tdep->sizeof_gregset = 19 * 4; + + /* FreeBSD 4.0 introduced a new `struct sigcontext'. */ + tdep->sc_reg_offset = i386fbsd4_sc_reg_offset; + tdep->sc_num_regs = ARRAY_SIZE (i386fbsd4_sc_reg_offset); +} + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_i386fbsd_tdep (void); + +void +_initialize_i386fbsd_tdep (void) +{ + gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_FREEBSD_AOUT, + i386fbsdaout_init_abi); + gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_FREEBSD_ELF, + i386fbsd4_init_abi); +} -- 2.7.4