From 78664fa36abb48b1c21151dfb95143c39310fbbe Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 25 Feb 2010 20:30:58 +0000 Subject: [PATCH] Symbian config gdb/ * arm-symbian-tdep.c: New. * configure.tgt (arm*-*-symbianelf*): New target. (*-*-symbianelf*): New OS. * osabi.c (gdb_osabi_names): Add Symbian. * defs.h (gdb_osabi): Add GDB_OSABI_SYMBIAN. * Makefile.in (ALL_TARGET_OBJS): Add arm-symbian-tdep.o. (ALLDEPFILES): Add arm-symbian-tdep.c. --- gdb/ChangeLog | 13 +++++ gdb/Makefile.in | 5 +- gdb/arm-symbian-tdep.c | 121 +++++++++++++++++++++++++++++++++++++++++ gdb/configure.tgt | 6 ++ gdb/defs.h | 3 +- gdb/osabi.c | 3 +- 6 files changed, 145 insertions(+), 6 deletions(-) create mode 100644 gdb/arm-symbian-tdep.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d30ce30819..34bb7f4797 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2010-02-25 Daniel Jacobowitz + + Symbian config + + gdb/ + * arm-symbian-tdep.c: New. + * configure.tgt (arm*-*-symbianelf*): New target. + (*-*-symbianelf*): New OS. + * osabi.c (gdb_osabi_names): Add Symbian. + * defs.h (gdb_osabi): Add GDB_OSABI_SYMBIAN. + * Makefile.in (ALL_TARGET_OBJS): Add arm-symbian-tdep.o. + (ALLDEPFILES): Add arm-symbian-tdep.c. + 2010-02-25 Daniel Jacobowitz * symfile.c (find_lowest_section): Include SEC_ALLOC sections. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 84cefb409a..6394d6671c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -488,7 +488,8 @@ ALL_64_TARGET_OBS = \ # All other target-dependent objects files (used with --enable-targets=all). ALL_TARGET_OBS = \ - armbsd-tdep.o arm-linux-tdep.o armnbsd-tdep.o armobsd-tdep.o \ + armbsd-tdep.o arm-linux-tdep.o arm-symbian-tdep.o \ + armnbsd-tdep.o armobsd-tdep.o \ arm-tdep.o arm-wince-tdep.o \ avr-tdep.o \ cris-tdep.o \ @@ -1406,7 +1407,7 @@ ALLDEPFILES = \ amd64-dicos-tdep.c \ amd64-linux-nat.c amd64-linux-tdep.c \ amd64-sol2-tdep.c \ - arm-linux-nat.c arm-linux-tdep.c arm-tdep.c \ + arm-linux-nat.c arm-linux-tdep.c arm-symbian-tdep.c arm-tdep.c \ armnbsd-nat.c armbsd-tdep.c armnbsd-tdep.c armobsd-tdep.c \ avr-tdep.c \ bsd-uthread.c bsd-kvm.c \ diff --git a/gdb/arm-symbian-tdep.c b/gdb/arm-symbian-tdep.c new file mode 100644 index 0000000000..264c00f50f --- /dev/null +++ b/gdb/arm-symbian-tdep.c @@ -0,0 +1,121 @@ +/* ARM Symbian OS target support. + + Copyright (C) 2008, 2009, 2010 + 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 3 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, see . */ + +#include "defs.h" +#include "frame.h" +#include "objfiles.h" +#include "osabi.h" +#include "solib.h" +#include "solib-target.h" +#include "target.h" +#include "elf-bfd.h" + +/* If PC is in a DLL import stub, return the address of the `real' + function belonging to the stub. */ + +CORE_ADDR +arm_symbian_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc) +{ + struct gdbarch *gdbarch; + enum bfd_endian byte_order; + ULONGEST insn; + CORE_ADDR dest; + gdb_byte buf[4]; + + if (!in_plt_section (pc, NULL)) + return 0; + + if (target_read_memory (pc, buf, 4) != 0) + return 0; + + gdbarch = get_frame_arch (frame); + byte_order = gdbarch_byte_order (gdbarch); + + /* ldr pc, [pc, #-4]. */ + insn = extract_unsigned_integer (buf, 4, byte_order); + if (insn != 0xe51ff004) + return 0; + + if (target_read_memory (pc + 4, buf, 4) != 0) + return 0; + + dest = extract_unsigned_integer (buf, 4, byte_order); + return gdbarch_addr_bits_remove (gdbarch, dest); +} + +static void +arm_symbian_init_abi (struct gdbarch_info info, + struct gdbarch *gdbarch) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + /* Shared library handling. */ + set_gdbarch_skip_trampoline_code (gdbarch, arm_symbian_skip_trampoline_code); + + set_solib_ops (gdbarch, &solib_target_so_ops); +} + +/* Recognize Symbian object files. */ + +static enum gdb_osabi +arm_symbian_osabi_sniffer (bfd *abfd) +{ + Elf_Internal_Phdr *phdrs, **segments; + long phdrs_size; + int num_phdrs, i; + + /* Symbian executables are always shared objects (ET_DYN). */ + if (elf_elfheader (abfd)->e_type == ET_EXEC) + return GDB_OSABI_UNKNOWN; + + if (elf_elfheader (abfd)->e_ident[EI_OSABI] != ELFOSABI_NONE) + return GDB_OSABI_UNKNOWN; + + /* Check for the ELF headers not being part of any PT_LOAD segment. + Symbian is the only GDB supported (or GNU binutils supported) ARM + target which uses a postlinker to flatten ELF files, dropping the + ELF dynamic info in the process. */ + phdrs_size = bfd_get_elf_phdr_upper_bound (abfd); + if (phdrs_size == -1) + return GDB_OSABI_UNKNOWN; + + phdrs = alloca (phdrs_size); + num_phdrs = bfd_get_elf_phdrs (abfd, phdrs); + if (num_phdrs == -1) + return GDB_OSABI_UNKNOWN; + + for (i = 0; i < num_phdrs; i++) + if (phdrs[i].p_type == PT_LOAD && phdrs[i].p_offset == 0) + return GDB_OSABI_UNKNOWN; + + /* Looks like a Symbian binary. */ + return GDB_OSABI_SYMBIAN; +} + +void +_initialize_arm_symbian_tdep (void) +{ + gdbarch_register_osabi_sniffer (bfd_arch_arm, + bfd_target_elf_flavour, + arm_symbian_osabi_sniffer); + + gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_SYMBIAN, + arm_symbian_init_abi); +} diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 62e6683780..ee016086d4 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -91,6 +91,10 @@ arm*-*-openbsd*) gdb_target_obs="arm-tdep.o armbsd-tdep.o armobsd-tdep.o obsd-tdep.o \ corelow.o solib.o solib-svr4.o" ;; +arm*-*-symbianelf*) + # Target: SymbianOS/arm + gdb_target_obs="arm-tdep.o solib-target.o arm-symbian-tdep.o" + ;; arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*) # Target: ARM embedded system gdb_target_obs="arm-tdep.o" @@ -626,4 +630,6 @@ m68*-*-openbsd* | m88*-*-openbsd* | vax-*-openbsd*) ;; *-*-mingw* | *-*-cygwin*) gdb_osabi=GDB_OSABI_CYGWIN ;; *-*-dicos*) gdb_osabi=GDB_OSABI_DICOS ;; +*-*-symbianelf*) + gdb_osabi=GDB_OSABI_SYMBIAN ;; esac diff --git a/gdb/defs.h b/gdb/defs.h index eee7b39ae9..b8973b3b80 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -969,13 +969,12 @@ enum gdb_osabi GDB_OSABI_INTERIX, GDB_OSABI_HPUX_ELF, GDB_OSABI_HPUX_SOM, - GDB_OSABI_QNXNTO, - GDB_OSABI_CYGWIN, GDB_OSABI_AIX, GDB_OSABI_DICOS, GDB_OSABI_DARWIN, + GDB_OSABI_SYMBIAN, GDB_OSABI_INVALID /* keep this last */ }; diff --git a/gdb/osabi.c b/gdb/osabi.c index eabc325c91..84590cdda7 100644 --- a/gdb/osabi.c +++ b/gdb/osabi.c @@ -67,13 +67,12 @@ static const char * const gdb_osabi_names[] = "Interix", "HP/UX ELF", "HP/UX SOM", - "QNX Neutrino", - "Cygwin", "AIX", "DICOS", "Darwin", + "Symbian", "" }; -- 2.34.1