From e6031aeb52be6c31dc1c7cbd7c74de76a114ad02 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Wed, 24 May 2000 22:32:58 +0000 Subject: Add support for FreeBSD/i386 ELF. * i386bsd-nat.c: New file. * config/i386/tm-fbsd.h (HAVE_I387_REGS): Define. Include "i386/tm-i386.h" instead of "i386/tm-i386b.h". (NUM_REGS): Remove redefinition. (USE_STRUCT_CONVENTION): Define. (i386_float_info): Remove prototype. (FLOAT_INFO): Remove define. (JB_ELEMENT_SIZE): Define to 4. (JB_PC): Define to 0. (GET_LONGJMP_TARGET): Define. (SIGTRAMP_START, SIGTRAMP_END): Define. (SIGCONTEXT_PC_OFFSET): Define. (IN_SOLIB_CALL_TRAMPOLINE): Only define if !SVR4_SHARED_LIBS * config/i386/nm-fbsd.h (PTRACE_ARG3_TYPE): Define to caddr_t. (FETCH_INFERIOR_REGISTERS): Define. (ATTACH_DETACH): Define. (kernel_u_size): Remove PARAMS. (register_u_addr): Use CORE_ADDR in prototype where appropriate. Remove PARAMS. (SVR4_SHARED_LIBS) [FREEBSD_ELF || __ELF__ && !FREEBSD_AOUT]: Define. [SVR4_SHARED_LIBS]: Include "elf/common.h". Only define aliases for struct members from if !SVR4_SHARED_LIBS. * config/i386/xm-fbsd.h: New file. * config/i386/fbsd.mt (TDEPFILES): Remove solib.o. * config/i386/fbsd.mh (NATDEPFILES): Remove i386b-nat.o. Add core-regset.o i387-nat.o i386bsd-nat.o. --- gdb/config/i386/fbsd.mh | 5 +++-- gdb/config/i386/fbsd.mt | 2 +- gdb/config/i386/nm-fbsd.h | 56 +++++++++++++++++++++++++++++++++-------------- gdb/config/i386/tm-fbsd.h | 56 +++++++++++++++++++++++++++++++++++++++-------- gdb/config/i386/xm-fbsd.h | 28 ++++++++++++++++++++++++ 5 files changed, 119 insertions(+), 28 deletions(-) create mode 100644 gdb/config/i386/xm-fbsd.h (limited to 'gdb/config') diff --git a/gdb/config/i386/fbsd.mh b/gdb/config/i386/fbsd.mh index 499ed48..243d0a6 100644 --- a/gdb/config/i386/fbsd.mh +++ b/gdb/config/i386/fbsd.mh @@ -1,5 +1,6 @@ # Host: Intel 386 running FreeBSD XDEPFILES= ser-tcp.o -NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o core-aout.o i386b-nat.o -XM_FILE= xm-i386bsd.h +NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o \ + corelow.o core-aout.o core-regset.o i387-nat.o i386bsd-nat.o +XM_FILE= xm-fbsd.h NAT_FILE= nm-fbsd.h diff --git a/gdb/config/i386/fbsd.mt b/gdb/config/i386/fbsd.mt index e644f1c..aff2a15 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 solib.o +TDEPFILES= i386-tdep.o i387-tdep.o TM_FILE= tm-fbsd.h diff --git a/gdb/config/i386/nm-fbsd.h b/gdb/config/i386/nm-fbsd.h index a2d1e3d..7f912e0 100644 --- a/gdb/config/i386/nm-fbsd.h +++ b/gdb/config/i386/nm-fbsd.h @@ -1,5 +1,5 @@ -/* Native-dependent definitions for Intel 386 running BSD Unix, for GDB. - Copyright 1986, 1987, 1989, 1992, 1996 Free Software Foundation, Inc. +/* Native-dependent definitions for FreeBSD/i386. + Copyright (C) 1986, 87, 89, 92, 96, 2000 Free Software Foundation, Inc. This file is part of GDB. @@ -18,11 +18,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef NM_FREEBSD_H -#define NM_FREEBSD_H +#ifndef NM_FBSD_H +#define NM_FBSD_H -/* Be shared lib aware */ -#include "solib.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 + +/* We can attach and detach. */ +#define ATTACH_DETACH + + +/* Support for the user struct. */ + +/* Return the size of the user struct. */ + +#define KERNEL_U_SIZE kernel_u_size () +extern int kernel_u_size (void); /* This is the amount to subtract from u.u_ar0 to get the offset in the core file of the register values. */ @@ -31,14 +45,27 @@ #define KERNEL_U_ADDR USRSTACK #define REGISTER_U_ADDR(addr, blockend, regno) \ - (addr) = i386_register_u_addr ((blockend),(regno)); + (addr) = register_u_addr ((blockend), (regno)) +extern CORE_ADDR register_u_addr (CORE_ADDR blockend, int regno); + -extern int -i386_register_u_addr PARAMS ((int, int)); +/* Shared library support. */ -#define PTRACE_ARG3_TYPE char* +/* The FreeBSD uses the same condition to distinguish ELF + from a.out. ELF implies SVR4 shared libraries. */ +#if (defined (FREEBSD_ELF) || defined (__ELF__)) && !defined (FREEBSD_AOUT) +#define SVR4_SHARED_LIBS +#endif + +#include "solib.h" /* Support for shared libraries. */ +#ifdef SVR4_SHARED_LIBS +#include "elf/common.h" /* Additional ELF shared library info. */ +#endif + +#ifndef SVR4_SHARED_LIBS + +/* Make structure definitions match up with those expected in `solib.c'. */ -/* make structure definitions match up with those expected in solib.c */ #define link_object sod #define lo_name sod_name #define lo_library sod_library @@ -91,9 +118,6 @@ i386_register_u_addr PARAMS ((int, int)); #define ld_un d_un #define ld_2 d_sdt -/* Return sizeof user struct to callers in less machine dependent routines */ - -#define KERNEL_U_SIZE kernel_u_size() -extern int kernel_u_size PARAMS ((void)); +#endif /* !SVR4_SHARED_LIBS */ -#endif /* NM_FREEBSD_H */ +#endif /* NM_FBSD_H */ diff --git a/gdb/config/i386/tm-fbsd.h b/gdb/config/i386/tm-fbsd.h index 0e2df32..df278a8 100644 --- a/gdb/config/i386/tm-fbsd.h +++ b/gdb/config/i386/tm-fbsd.h @@ -1,5 +1,5 @@ -/* Target macro definitions for i386 running FreeBSD - Copyright (C) 1997 Free Software Foundation, Inc. +/* Target-dependent definitions for FreeBSD/i386. + Copyright (C) 1997, 2000 Free Software Foundation, Inc. This file is part of GDB. @@ -18,16 +18,54 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "i386/tm-i386bsd.h" +#ifndef TM_FBSD_H +#define TM_FBSD_H +#define HAVE_I387_REGS +#include "i386/tm-i386.h" -#undef NUM_REGS -#define NUM_REGS 14 +/* FreeBSD uses the old gcc convention for struct returns. */ +#define USE_STRUCT_CONVENTION(gcc_p, type) \ + generic_use_struct_convention (1, type) + -#undef IN_SOLIB_CALL_TRAMPOLINE -#define IN_SOLIB_CALL_TRAMPOLINE(pc, name) STREQ (name, "_DYNAMIC") +/* Support for longjmp. */ +/* Details about jmp_buf. It's supposed to be an array of integers. */ -extern i386_float_info (); -#define FLOAT_INFO i386_float_info () +#define JB_ELEMENT_SIZE 4 /* Size of elements in jmp_buf. */ +#define JB_PC 0 /* Array index of saved PC. */ + +/* Figure out where the longjmp will land. Store the address that + longjmp will jump to in *ADDR, and return non-zero if successful. */ + +extern int get_longjmp_target (CORE_ADDR *addr); +#define GET_LONGJMP_TARGET(addr) get_longjmp_target (addr) + + +/* Support for signal handlers. */ + +/* The sigtramp is above the user stack and immediately below + the user area. Using constants here allows for cross debugging. + These are tested for FreeBSD 3.4. */ + +#define SIGTRAMP_START(pc) 0xbfbfdf20 +#define SIGTRAMP_END(pc) 0xbfbfdff0 + +/* Offset to saved PC in sigcontext, from . */ +#define SIGCONTEXT_PC_OFFSET 20 + + +/* Shared library support. */ + +#ifndef SVR4_SHARED_LIBS + +/* Return non-zero if we are in a shared library trampoline code stub. */ + +#define IN_SOLIB_CALL_TRAMPOLINE(pc, name) \ + (name && !strcmp(name, "_DYNAMIC")) + +#endif /* !SVR4_SHARED_LIBS */ + +#endif /* TM_FBSD_H */ diff --git a/gdb/config/i386/xm-fbsd.h b/gdb/config/i386/xm-fbsd.h new file mode 100644 index 0000000..ee90c14 --- /dev/null +++ b/gdb/config/i386/xm-fbsd.h @@ -0,0 +1,28 @@ +/* Host-dependent definitions for FreeBSD/i386. + Copyright (C) 2000 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 XM_FBSD_H +#define XM_FBSD_H + +#define HOST_BYTE_ORDER LITTLE_ENDIAN + +#define HOST_LONG_DOUBLE_FORMAT &floatformat_i387_ext + +#endif /* XM_FBSD_H */ -- cgit v1.1