X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fm68klinux-tdep.c;h=eaa103149661814d925549e5d5c11ef1e71ef895;hb=ebd3bcc1327e6a7de6daf6536134cb20be9c2cfd;hp=fb0fd2097edf5e11087ef86dd2ac9324a4e2f9d1;hpb=359a926234e5b72f99e7e60d46b4886b5c9af0b2;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/m68klinux-tdep.c b/gdb/m68klinux-tdep.c
index fb0fd2097e..eaa1031496 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
+ 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. */
@@ -68,7 +69,7 @@ m68k_linux_pc_in_sigtramp (CORE_ADDR pc, char *name)
char buf[12];
unsigned long insn0, insn1, insn2;
- if (read_memory_nobpt (pc - 4, buf, sizeof (buf)))
+ if (target_read_memory (pc - 4, buf, sizeof (buf)))
return 0;
insn1 = extract_unsigned_integer (buf + 4, 4);
insn2 = extract_unsigned_integer (buf + 8, 4);
@@ -112,7 +113,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 +128,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,6 +207,17 @@ 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)
{
@@ -180,6 +225,18 @@ m68k_linux_get_sigtramp_info (struct frame_info *next_frame)
char buf[4];
struct m68k_linux_sigtramp_info info;
+ 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;
+ }
+
frame_unwind_register (next_frame, M68K_SP_REGNUM, buf);
sp = extract_unsigned_integer (buf, 4);
@@ -189,7 +246,9 @@ m68k_linux_get_sigtramp_info (struct frame_info *next_frame)
if (m68k_linux_pc_in_sigtramp (frame_pc_unwind (next_frame), 0) == 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;
}
@@ -201,7 +260,7 @@ m68k_linux_sigtramp_frame_cache (struct frame_info *next_frame,
{
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 (next_frame));
struct m68k_linux_sigtramp_info info;
char buf[4];
int i;
@@ -294,6 +353,8 @@ m68k_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
tdep->struct_value_regnum = M68K_A1_REGNUM;
tdep->struct_return = reg_struct_return;
+ set_gdbarch_decr_pc_after_break (gdbarch, 2);
+
frame_unwind_append_sniffer (gdbarch, m68k_linux_sigtramp_frame_sniffer);
/* Shared library handling. */
@@ -317,4 +378,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);
}