X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fm68klinux-tdep.c;h=29b112065d7eaf9b7b7387a5262fe715fc1e4a17;hb=ec56be1b4dc25ec39c32ceab997747ad651c9d22;hp=a99acc9496f6fb2d75be947aae1775828790709a;hpb=6aba47ca06d9150c6196a374b745c2711b46e045;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/m68klinux-tdep.c b/gdb/m68klinux-tdep.c index a99acc9496..29b112065d 100644 --- a/gdb/m68klinux-tdep.c +++ b/gdb/m68klinux-tdep.c @@ -1,13 +1,13 @@ /* Motorola m68k target-dependent support for GNU/Linux. - Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2007 + Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2007, 2008 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 + 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, @@ -16,9 +16,7 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include "defs.h" #include "gdbcore.h" @@ -37,6 +35,9 @@ #include "frame-unwind.h" #include "glibc-tdep.h" #include "solib-svr4.h" +#include "auxv.h" +#include "observer.h" +#include "elf/common.h" /* Offsets (in target ints) into jmp_buf. */ @@ -57,18 +58,19 @@ /* moveq #82,d0; notb d0; trap #0 */ \ || (insn1 == 0x70524600 && (insn2 >> 16) == 0x4e40)) -/* Return non-zero if PC points into the signal trampoline. For the - sake of m68k_linux_get_sigtramp_info we also distinguish between +/* Return non-zero if THIS_FRAME corresponds to a signal trampoline. For + the sake of m68k_linux_get_sigtramp_info we also distinguish between non-RT and RT signal trampolines. */ static int -m68k_linux_pc_in_sigtramp (CORE_ADDR pc, char *name) +m68k_linux_pc_in_sigtramp (struct frame_info *this_frame) { CORE_ADDR sp; - char buf[12]; + gdb_byte buf[12]; unsigned long insn0, insn1, insn2; + CORE_ADDR pc = get_frame_pc (this_frame); - if (read_memory_nobpt (pc - 4, buf, sizeof (buf))) + if (!safe_frame_unwind_memory (this_frame, pc - 4, buf, sizeof (buf))) return 0; insn1 = extract_unsigned_integer (buf + 4, 4); insn2 = extract_unsigned_integer (buf + 8, 4); @@ -112,7 +114,7 @@ static int m68k_linux_sigcontext_reg_offset[M68K_NUM_REGS] = -1, /* %a5 */ -1, /* %fp */ 1 * 4, /* %sp */ - 5 * 4 + 2, /* %sr */ + 6 * 4, /* %sr */ 6 * 4 + 2, /* %pc */ 8 * 4, /* %fp0 */ 11 * 4, /* %fp1 */ @@ -127,6 +129,39 @@ static int m68k_linux_sigcontext_reg_offset[M68K_NUM_REGS] = 16 * 4 /* %fpiaddr */ }; +static int m68k_uclinux_sigcontext_reg_offset[M68K_NUM_REGS] = +{ + 2 * 4, /* %d0 */ + 3 * 4, /* %d1 */ + -1, /* %d2 */ + -1, /* %d3 */ + -1, /* %d4 */ + -1, /* %d5 */ + -1, /* %d6 */ + -1, /* %d7 */ + 4 * 4, /* %a0 */ + 5 * 4, /* %a1 */ + -1, /* %a2 */ + -1, /* %a3 */ + -1, /* %a4 */ + 6 * 4, /* %a5 */ + -1, /* %fp */ + 1 * 4, /* %sp */ + 7 * 4, /* %sr */ + 7 * 4 + 2, /* %pc */ + -1, /* %fp0 */ + -1, /* %fp1 */ + -1, /* %fp2 */ + -1, /* %fp3 */ + -1, /* %fp4 */ + -1, /* %fp5 */ + -1, /* %fp6 */ + -1, /* %fp7 */ + -1, /* %fpcr */ + -1, /* %fpsr */ + -1 /* %fpiaddr */ +}; + /* From . */ static int m68k_linux_ucontext_reg_offset[M68K_NUM_REGS] = { @@ -173,55 +208,77 @@ struct m68k_linux_sigtramp_info int *sc_reg_offset; }; +/* Nonzero if running on uClinux. */ +static int target_is_uclinux; + +static void +m68k_linux_inferior_created (struct target_ops *objfile, int from_tty) +{ + /* Record that we will need to re-evaluate whether we are running on a + uClinux or normal GNU/Linux target (see m68k_linux_get_sigtramp_info). */ + target_is_uclinux = -1; +} + static struct m68k_linux_sigtramp_info -m68k_linux_get_sigtramp_info (struct frame_info *next_frame) +m68k_linux_get_sigtramp_info (struct frame_info *this_frame) { CORE_ADDR sp; - char buf[4]; struct m68k_linux_sigtramp_info info; - frame_unwind_register (next_frame, M68K_SP_REGNUM, buf); - sp = extract_unsigned_integer (buf, 4); + if (target_is_uclinux == -1) + { + /* Determine whether we are running on a uClinux or normal GNU/Linux + target so we can use the correct sigcontext layouts. */ + CORE_ADDR dummy; + + target_is_uclinux + = (target_auxv_search (¤t_target, AT_NULL, &dummy) > 0 + && target_auxv_search (¤t_target, AT_PAGESZ, &dummy) == 0); + } + + sp = get_frame_register_unsigned (this_frame, M68K_SP_REGNUM); /* Get sigcontext address, it is the third parameter on the stack. */ info.sigcontext_addr = read_memory_unsigned_integer (sp + 8, 4); - if (m68k_linux_pc_in_sigtramp (frame_pc_unwind (next_frame), 0) == 2) + if (m68k_linux_pc_in_sigtramp (this_frame) == 2) info.sc_reg_offset = m68k_linux_ucontext_reg_offset; else - info.sc_reg_offset = m68k_linux_sigcontext_reg_offset; + info.sc_reg_offset = (target_is_uclinux + ? m68k_uclinux_sigcontext_reg_offset + : m68k_linux_sigcontext_reg_offset); return info; } /* Signal trampolines. */ static struct trad_frame_cache * -m68k_linux_sigtramp_frame_cache (struct frame_info *next_frame, +m68k_linux_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) { struct frame_id this_id; struct trad_frame_cache *cache; - struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); + struct gdbarch_tdep *tdep = gdbarch_tdep (get_frame_arch (this_frame)); struct m68k_linux_sigtramp_info info; - char buf[4]; + gdb_byte buf[4]; int i; if (*this_cache) return *this_cache; - cache = trad_frame_cache_zalloc (next_frame); + cache = trad_frame_cache_zalloc (this_frame); /* FIXME: cagney/2004-05-01: This is is long standing broken code. The frame ID's code address should be the start-address of the signal trampoline and not the current PC within that trampoline. */ - frame_unwind_register (next_frame, M68K_SP_REGNUM, buf); + get_frame_register (this_frame, M68K_SP_REGNUM, buf); /* See the end of m68k_push_dummy_call. */ this_id = frame_id_build (extract_unsigned_integer (buf, 4) - 4 + 8, - frame_pc_unwind (next_frame)); + get_frame_pc (this_frame)); trad_frame_set_id (cache, this_id); - info = m68k_linux_get_sigtramp_info (next_frame); + info = m68k_linux_get_sigtramp_info (this_frame); for (i = 0; i < M68K_NUM_REGS; i++) if (info.sc_reg_offset[i] != -1) @@ -233,50 +290,43 @@ m68k_linux_sigtramp_frame_cache (struct frame_info *next_frame, } static void -m68k_linux_sigtramp_frame_this_id (struct frame_info *next_frame, +m68k_linux_sigtramp_frame_this_id (struct frame_info *this_frame, void **this_cache, struct frame_id *this_id) { struct trad_frame_cache *cache = - m68k_linux_sigtramp_frame_cache (next_frame, this_cache); + m68k_linux_sigtramp_frame_cache (this_frame, this_cache); trad_frame_get_id (cache, this_id); } -static void -m68k_linux_sigtramp_frame_prev_register (struct frame_info *next_frame, +static struct value * +m68k_linux_sigtramp_frame_prev_register (struct frame_info *this_frame, void **this_cache, - int regnum, int *optimizedp, - enum lval_type *lvalp, - CORE_ADDR *addrp, - int *realnump, gdb_byte *valuep) + int regnum) { /* Make sure we've initialized the cache. */ struct trad_frame_cache *cache = - m68k_linux_sigtramp_frame_cache (next_frame, this_cache); - trad_frame_get_register (cache, next_frame, regnum, optimizedp, lvalp, - addrp, realnump, valuep); + m68k_linux_sigtramp_frame_cache (this_frame, this_cache); + return trad_frame_get_register (cache, this_frame, regnum); +} + +static int +m68k_linux_sigtramp_frame_sniffer (const struct frame_unwind *self, + struct frame_info *this_frame, + void **this_prologue_cache) +{ + return m68k_linux_pc_in_sigtramp (this_frame); } static const struct frame_unwind m68k_linux_sigtramp_frame_unwind = { SIGTRAMP_FRAME, m68k_linux_sigtramp_frame_this_id, - m68k_linux_sigtramp_frame_prev_register + m68k_linux_sigtramp_frame_prev_register, + NULL, + m68k_linux_sigtramp_frame_sniffer }; -static const struct frame_unwind * -m68k_linux_sigtramp_frame_sniffer (struct frame_info *next_frame) -{ - CORE_ADDR pc = frame_pc_unwind (next_frame); - char *name; - - find_pc_partial_function (pc, &name, NULL, NULL); - if (m68k_linux_pc_in_sigtramp (pc, name)) - return &m68k_linux_sigtramp_frame_unwind; - - return NULL; -} - static void m68k_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { @@ -294,7 +344,9 @@ m68k_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->struct_value_regnum = M68K_A1_REGNUM; tdep->struct_return = reg_struct_return; - frame_unwind_append_sniffer (gdbarch, m68k_linux_sigtramp_frame_sniffer); + set_gdbarch_decr_pc_after_break (gdbarch, 2); + + frame_unwind_append_unwinder (gdbarch, &m68k_linux_sigtramp_frame_unwind); /* Shared library handling. */ @@ -317,4 +369,5 @@ _initialize_m68k_linux_tdep (void) { gdbarch_register_osabi (bfd_arch_m68k, 0, GDB_OSABI_LINUX, m68k_linux_init_abi); + observer_attach_inferior_created (m68k_linux_inferior_created); }