X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fi386nbsd-tdep.c;h=e0719f48d5bb7302c24c54d875ff01ff7abb1fc6;hb=48e6666a0d550f290ea174682c78b0d62a027076;hp=dae0a1d5e208a7b0a8d5dc2c620459fd0ff856a0;hpb=41d041d67127783bcb817154c71354e26dbef6d0;p=platform%2Fupstream%2Fbinutils.git
diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c
index dae0a1d..e0719f4 100644
--- a/gdb/i386nbsd-tdep.c
+++ b/gdb/i386nbsd-tdep.c
@@ -1,13 +1,12 @@
/* Target-dependent code for NetBSD/i386.
- Copyright 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002, 2003
- Free Software Foundation, Inc.
+ Copyright (C) 1988-2014 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,249 +15,255 @@
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. */
+ along with this program. If not, see . */
#include "defs.h"
-#include "gdbtypes.h"
+#include "arch-utils.h"
+#include "frame.h"
#include "gdbcore.h"
#include "regcache.h"
-#include "arch-utils.h"
+#include "regset.h"
#include "osabi.h"
+#include "symtab.h"
+#include "trad-frame.h"
+#include "tramp-frame.h"
#include "i386-tdep.h"
#include "i387-tdep.h"
#include "nbsd-tdep.h"
-
#include "solib-svr4.h"
-/* Map a GDB register number to an offset in the reg structure. */
-static int regmap[] =
+/* From . */
+static int i386nbsd_r_reg_offset[] =
{
- ( 0 * 4), /* %eax */
- ( 1 * 4), /* %ecx */
- ( 2 * 4), /* %edx */
- ( 3 * 4), /* %ebx */
- ( 4 * 4), /* %esp */
- ( 5 * 4), /* %epb */
- ( 6 * 4), /* %esi */
- ( 7 * 4), /* %edi */
- ( 8 * 4), /* %eip */
- ( 9 * 4), /* %eflags */
- (10 * 4), /* %cs */
- (11 * 4), /* %ss */
- (12 * 4), /* %ds */
- (13 * 4), /* %es */
- (14 * 4), /* %fs */
- (15 * 4), /* %gs */
+ 0 * 4, /* %eax */
+ 1 * 4, /* %ecx */
+ 2 * 4, /* %edx */
+ 3 * 4, /* %ebx */
+ 4 * 4, /* %esp */
+ 5 * 4, /* %ebp */
+ 6 * 4, /* %esi */
+ 7 * 4, /* %edi */
+ 8 * 4, /* %eip */
+ 9 * 4, /* %eflags */
+ 10 * 4, /* %cs */
+ 11 * 4, /* %ss */
+ 12 * 4, /* %ds */
+ 13 * 4, /* %es */
+ 14 * 4, /* %fs */
+ 15 * 4 /* %gs */
};
-#define SIZEOF_STRUCT_REG (16 * 4)
-
-static void
-i386nbsd_supply_reg (char *regs, int regno)
+/* From . */
+int i386nbsd_sc_reg_offset[] =
{
- int i;
-
- for (i = 0; i <= 15; i++)
- if (regno == i || regno == -1)
- supply_register (i, regs + regmap[i]);
-}
+ 10 * 4, /* %eax */
+ 9 * 4, /* %ecx */
+ 8 * 4, /* %edx */
+ 7 * 4, /* %ebx */
+ 14 * 4, /* %esp */
+ 6 * 4, /* %ebp */
+ 5 * 4, /* %esi */
+ 4 * 4, /* %edi */
+ 11 * 4, /* %eip */
+ 13 * 4, /* %eflags */
+ 12 * 4, /* %cs */
+ 15 * 4, /* %ss */
+ 3 * 4, /* %ds */
+ 2 * 4, /* %es */
+ 1 * 4, /* %fs */
+ 0 * 4 /* %gs */
+};
-static void
-fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
- CORE_ADDR ignore)
+/* From . */
+int i386nbsd_mc_reg_offset[] =
{
- char *regs, *fsave;
-
- /* We get everything from one section. */
- if (which != 0)
- return;
-
- if (core_reg_size < (SIZEOF_STRUCT_REG + 108))
- {
- warning ("Wrong size register set in core file.");
- return;
- }
-
- regs = core_reg_sect;
- fsave = core_reg_sect + SIZEOF_STRUCT_REG;
+ 11 * 4, /* %eax */
+ 10 * 4, /* %ecx */
+ 9 * 4, /* %edx */
+ 8 * 4, /* %ebx */
+ 7 * 4, /* %esp */
+ 6 * 4, /* %ebp */
+ 5 * 4, /* %esi */
+ 4 * 4, /* %edi */
+ 14 * 4, /* %eip */
+ 16 * 4, /* %eflags */
+ 15 * 4, /* %cs */
+ 18 * 4, /* %ss */
+ 3 * 4, /* %ds */
+ 2 * 4, /* %es */
+ 1 * 4, /* %fs */
+ 0 * 4 /* %gs */
+};
- /* Integer registers. */
- i386nbsd_supply_reg (regs, -1);
+static void i386nbsd_sigtramp_cache_init (const struct tramp_frame *,
+ struct frame_info *,
+ struct trad_frame_cache *,
+ CORE_ADDR);
- /* Floating point registers. */
- i387_supply_fsave (current_regcache, -1, fsave);
-}
+static const struct tramp_frame i386nbsd_sigtramp_sc16 =
+{
+ SIGTRAMP_FRAME,
+ 1,
+ {
+ { 0x8d, -1 }, { 0x44, -1 }, { 0x24, -1 }, { 0x10, -1 },
+ /* leal 0x10(%esp), %eax */
+ { 0x50, -1 }, /* pushl %eax */
+ { 0x50, -1 }, /* pushl %eax */
+ { 0xb8, -1 }, { 0x27, -1 }, {0x01, -1 }, {0x00, -1 }, {0x00, -1 },
+ /* movl $0x127, %eax # __sigreturn14 */
+ { 0xcd, -1 }, { 0x80, -1},
+ /* int $0x80 */
+ { 0xb8, -1 }, { 0x01, -1 }, {0x00, -1 }, {0x00, -1 }, {0x00, -1 },
+ /* movl $0x1, %eax # exit */
+ { 0xcd, -1 }, { 0x80, -1},
+ /* int $0x80 */
+ { TRAMP_SENTINEL_INSN, -1 }
+ },
+ i386nbsd_sigtramp_cache_init
+};
-static void
-fetch_elfcore_registers (char *core_reg_sect, unsigned core_reg_size,
- int which, CORE_ADDR ignore)
+static const struct tramp_frame i386nbsd_sigtramp_sc2 =
{
- switch (which)
- {
- case 0: /* Integer registers. */
- if (core_reg_size != SIZEOF_STRUCT_REG)
- warning ("Wrong size register set in core file.");
- else
- i386nbsd_supply_reg (core_reg_sect, -1);
- break;
-
- case 2: /* Floating point registers. */
- if (core_reg_size != 108)
- warning ("Wrong size FP register set in core file.");
- else
- i387_supply_fsave (current_regcache, -1, core_reg_sect);
- break;
-
- case 3: /* "Extended" floating point registers. This is gdb-speak
- for SSE/SSE2. */
- if (core_reg_size != 512)
- warning ("Wrong size XMM register set in core file.");
- else
- i387_supply_fxsave (current_regcache, -1, core_reg_sect);
- break;
-
- default:
- /* Don't know what kind of register request this is; just ignore it. */
- break;
- }
-}
+ SIGTRAMP_FRAME,
+ 1,
+ {
+ { 0x8d, -1 }, { 0x44, -1 }, { 0x24, -1 }, { 0x0c, -1 },
+ /* leal 0x0c(%esp), %eax */
+ { 0x89, -1 }, { 0x44, -1 }, { 0x24, -1 }, { 0x04, -1 },
+ /* movl %eax, 0x4(%esp) */
+ { 0xb8, -1 }, { 0x27, -1 }, {0x01, -1 }, {0x00, -1 }, {0x00, -1 },
+ /* movl $0x127, %eax # __sigreturn14 */
+ { 0xcd, -1 }, { 0x80, -1},
+ /* int $0x80 */
+ { 0x89, -1 }, { 0x44, -1 }, { 0x24, -1 }, { 0x04, -1 },
+ /* movl %eax, 0x4(%esp) */
+ { 0xb8, -1 }, { 0x01, -1 }, {0x00, -1 }, {0x00, -1 }, {0x00, -1 },
+ /* movl $0x1, %eax */
+ { 0xcd, -1 }, { 0x80, -1},
+ /* int $0x80 */
+ { TRAMP_SENTINEL_INSN, -1 }
+ },
+ i386nbsd_sigtramp_cache_init
+};
-static struct core_fns i386nbsd_core_fns =
+static const struct tramp_frame i386nbsd_sigtramp_si2 =
{
- bfd_target_unknown_flavour, /* core_flavour */
- default_check_format, /* check_format */
- default_core_sniffer, /* core_sniffer */
- fetch_core_registers, /* core_read_registers */
- NULL /* next */
+ SIGTRAMP_FRAME,
+ 1,
+ {
+ { 0x8b, -1 }, { 0x44, -1 }, { 0x24, -1 }, { 0x08, -1 },
+ /* movl 8(%esp),%eax */
+ { 0x89, -1 }, { 0x44, -1 }, { 0x24, -1 }, { 0x04, -1 },
+ /* movl %eax, 0x4(%esp) */
+ { 0xb8, -1 }, { 0x34, -1 }, { 0x01, -1 }, { 0x00, -1 }, { 0x00, -1 },
+ /* movl $0x134, %eax # setcontext */
+ { 0xcd, -1 }, { 0x80, -1 },
+ /* int $0x80 */
+ { 0x89, -1 }, { 0x44, -1 }, { 0x24, -1 }, { 0x04, -1 },
+ /* movl %eax, 0x4(%esp) */
+ { 0xb8, -1 }, { 0x01, -1 }, { 0x00, -1 }, { 0x00, -1 }, { 0x00, -1 },
+ /* movl $0x1, %eax */
+ { 0xcd, -1 }, { 0x80, -1 },
+ /* int $0x80 */
+ { TRAMP_SENTINEL_INSN, -1 }
+ },
+ i386nbsd_sigtramp_cache_init
};
-static struct core_fns i386nbsd_elfcore_fns =
+static const struct tramp_frame i386nbsd_sigtramp_si31 =
{
- bfd_target_elf_flavour, /* core_flavour */
- default_check_format, /* check_format */
- default_core_sniffer, /* core_sniffer */
- fetch_elfcore_registers, /* core_read_registers */
- NULL /* next */
+ SIGTRAMP_FRAME,
+ 1,
+ {
+ { 0x8d, -1 }, { 0x84, -1 }, { 0x24, -1 },
+ { 0x8c, -1 }, { 0x00, -1 }, { 0x00, -1 }, { 0x00, -1 },
+ /* leal 0x8c(%esp), %eax */
+ { 0x89, -1 }, { 0x44, -1 }, { 0x24, -1 }, { 0x04, -1 },
+ /* movl %eax, 0x4(%esp) */
+ { 0xb8, -1 }, { 0x34, -1 }, { 0x01, -1 }, { 0x00, -1 }, { 0x00, -1 },
+ /* movl $0x134, %eax # setcontext */
+ { 0xcd, -1 }, { 0x80, -1},
+ /* int $0x80 */
+ { 0x89, -1 }, { 0x44, -1 }, { 0x24, -1 }, { 0x04, -1 },
+ /* movl %eax, 0x4(%esp) */
+ { 0xb8, -1 }, { 0x01, -1 }, {0x00, -1 }, {0x00, -1 }, {0x00, -1 },
+ /* movl $0x1, %eax */
+ { 0xcd, -1 }, { 0x80, -1},
+ /* int $0x80 */
+ { TRAMP_SENTINEL_INSN, -1 }
+ },
+ i386nbsd_sigtramp_cache_init
};
-/* Under NetBSD/i386, signal handler invocations can be identified by the
- designated code sequence that is used to return from a signal handler.
- In particular, the return address of a signal handler points to the
- following code sequence:
-
- leal 0x10(%esp), %eax
- pushl %eax
- pushl %eax
- movl $0x127, %eax # __sigreturn14
- int $0x80
-
- Each instruction has a unique encoding, so we simply attempt to match
- the instruction the PC is pointing to with any of the above instructions.
- If there is a hit, we know the offset to the start of the designated
- sequence and can then check whether we really are executing in the
- signal trampoline. If not, -1 is returned, otherwise the offset from the
- start of the return sequence is returned. */
-#define RETCODE_INSN1 0x8d
-#define RETCODE_INSN2 0x50
-#define RETCODE_INSN3 0x50
-#define RETCODE_INSN4 0xb8
-#define RETCODE_INSN5 0xcd
-
-#define RETCODE_INSN2_OFF 4
-#define RETCODE_INSN3_OFF 5
-#define RETCODE_INSN4_OFF 6
-#define RETCODE_INSN5_OFF 11
-
-static const unsigned char sigtramp_retcode[] =
+static const struct tramp_frame i386nbsd_sigtramp_si4 =
{
- RETCODE_INSN1, 0x44, 0x24, 0x10,
- RETCODE_INSN2,
- RETCODE_INSN3,
- RETCODE_INSN4, 0x27, 0x01, 0x00, 0x00,
- RETCODE_INSN5, 0x80,
+ SIGTRAMP_FRAME,
+ 1,
+ {
+ { 0x8d, -1 }, { 0x84, -1 }, { 0x24, -1 },
+ { 0x8c, -1 }, { 0x00, -1 }, { 0x00, -1 }, { 0x00, -1 },
+ /* leal 0x8c(%esp), %eax */
+ { 0x89, -1 }, { 0x44, -1 }, { 0x24, -1 }, { 0x04, -1 },
+ /* movl %eax, 0x4(%esp) */
+ { 0xb8, -1 }, { 0x34, -1 }, { 0x01, -1 }, { 0x00, -1 }, { 0x00, -1 },
+ /* movl $0x134, %eax # setcontext */
+ { 0xcd, -1 }, { 0x80, -1},
+ /* int $0x80 */
+ { 0xc7, -1 }, { 0x44, -1 }, { 0x24, -1 }, { 0x04, -1 },
+ { 0xff, -1 }, { 0xff, -1 }, { 0xff, -1 }, { 0xff, -1 },
+ /* movl $0xffffffff,0x4(%esp) */
+ { 0xb8, -1 }, { 0x01, -1 }, {0x00, -1 }, {0x00, -1 }, {0x00, -1 },
+ /* movl $0x1, %eax */
+ { 0xcd, -1 }, { 0x80, -1},
+ /* int $0x80 */
+ { TRAMP_SENTINEL_INSN, -1 }
+ },
+ i386nbsd_sigtramp_cache_init
};
-static LONGEST
-i386nbsd_sigtramp_offset (CORE_ADDR pc)
+static void
+i386nbsd_sigtramp_cache_init (const struct tramp_frame *self,
+ struct frame_info *this_frame,
+ struct trad_frame_cache *this_cache,
+ CORE_ADDR func)
{
- unsigned char ret[sizeof(sigtramp_retcode)], insn;
- LONGEST off;
+ struct gdbarch *gdbarch = get_frame_arch (this_frame);
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ CORE_ADDR sp = get_frame_register_unsigned (this_frame, I386_ESP_REGNUM);
+ CORE_ADDR base;
+ int *reg_offset;
+ int num_regs;
int i;
- if (read_memory_nobpt (pc, &insn, 1) != 0)
- return -1;
-
- switch (insn)
+ if (self == &i386nbsd_sigtramp_sc16 || self == &i386nbsd_sigtramp_sc2)
{
- case RETCODE_INSN1:
- off = 0;
- break;
-
- case RETCODE_INSN2:
- /* INSN2 and INSN3 are the same. Read at the location of PC+1
- to determine if we're actually looking at INSN2 or INSN3. */
- if (read_memory_nobpt (pc + 1, &insn, 1) != 0)
- return -1;
-
- if (insn == RETCODE_INSN3)
- off = RETCODE_INSN2_OFF;
- else
- off = RETCODE_INSN3_OFF;
- break;
-
- case RETCODE_INSN4:
- off = RETCODE_INSN4_OFF;
- break;
-
- case RETCODE_INSN5:
- off = RETCODE_INSN5_OFF;
- break;
-
- default:
- return -1;
- }
+ reg_offset = i386nbsd_sc_reg_offset;
+ num_regs = ARRAY_SIZE (i386nbsd_sc_reg_offset);
- pc -= off;
-
- if (read_memory_nobpt (pc, (char *) ret, sizeof (ret)) != 0)
- return -1;
+ /* Read in the sigcontext address. */
+ base = read_memory_unsigned_integer (sp + 8, 4, byte_order);
+ }
+ else
+ {
+ reg_offset = i386nbsd_mc_reg_offset;
+ num_regs = ARRAY_SIZE (i386nbsd_mc_reg_offset);
- if (memcmp (ret, sigtramp_retcode, sizeof (ret)) == 0)
- return off;
+ /* Read in the ucontext address. */
+ base = read_memory_unsigned_integer (sp + 8, 4, byte_order);
+ /* offsetof(ucontext_t, uc_mcontext) == 36 */
+ base += 36;
+ }
- return -1;
-}
+ for (i = 0; i < num_regs; i++)
+ if (reg_offset[i] != -1)
+ trad_frame_set_reg_addr (this_cache, i, base + reg_offset[i]);
-static int
-i386nbsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
-{
- return (nbsd_pc_in_sigtramp (pc, name)
- || i386nbsd_sigtramp_offset (pc) >= 0);
+ /* Construct the frame ID using the function start. */
+ trad_frame_set_id (this_cache, frame_id_build (sp, func));
}
-
-/* From . */
-int i386nbsd_sc_reg_offset[I386_NUM_GREGS] =
-{
- 10 * 4, /* %eax */
- 9 * 4, /* %ecx */
- 8 * 4, /* %edx */
- 7 * 4, /* %ebx */
- 14 * 4, /* %esp */
- 6 * 4, /* %ebp */
- 5 * 4, /* %esi */
- 4 * 4, /* %edi */
- 11 * 4, /* %eip */
- 13 * 4, /* %eflags */
- 12 * 4, /* %cs */
- 15 * 4, /* %ss */
- 3 * 4, /* %ds */
- 2 * 4, /* %es */
- 1 * 4, /* %fs */
- 0 * 4 /* %gs */
-};
+
static void
i386nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
@@ -268,24 +273,31 @@ i386nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
/* Obviously NetBSD is BSD-based. */
i386bsd_init_abi (info, gdbarch);
- /* NetBSD has different signal trampoline conventions. */
- set_gdbarch_pc_in_sigtramp (gdbarch, i386nbsd_pc_in_sigtramp);
- /* FIXME: kettenis/20020906: We should probably provide
- NetBSD-specific versions of these functions if we want to
- recognize signal trampolines that live on the stack. */
- set_gdbarch_sigtramp_start (gdbarch, NULL);
- set_gdbarch_sigtramp_end (gdbarch, NULL);
+ /* NetBSD has a different `struct reg'. */
+ tdep->gregset_reg_offset = i386nbsd_r_reg_offset;
+ tdep->gregset_num_regs = ARRAY_SIZE (i386nbsd_r_reg_offset);
+ tdep->sizeof_gregset = 16 * 4;
/* NetBSD uses -freg-struct-return by default. */
tdep->struct_return = reg_struct_return;
- /* NetBSD has a `struct sigcontext' that's different from the
- origional 4.3 BSD. */
- tdep->sc_reg_offset = i386nbsd_sc_reg_offset;
- tdep->sc_num_regs = I386_NUM_GREGS;
+ /* NetBSD uses tramp_frame sniffers for signal trampolines. */
+ tdep->sigcontext_addr= 0;
+ tdep->sigtramp_start = 0;
+ tdep->sigtramp_end = 0;
+ tdep->sigtramp_p = 0;
+ tdep->sc_reg_offset = 0;
+ tdep->sc_num_regs = 0;
+
+ tramp_frame_prepend_unwinder (gdbarch, &i386nbsd_sigtramp_sc16);
+ tramp_frame_prepend_unwinder (gdbarch, &i386nbsd_sigtramp_sc2);
+ tramp_frame_prepend_unwinder (gdbarch, &i386nbsd_sigtramp_si2);
+ tramp_frame_prepend_unwinder (gdbarch, &i386nbsd_sigtramp_si31);
+ tramp_frame_prepend_unwinder (gdbarch, &i386nbsd_sigtramp_si4);
}
/* NetBSD ELF. */
+
static void
i386nbsdelf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
@@ -298,28 +310,19 @@ i386nbsdelf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
i386_elf_init_abi (info, gdbarch);
/* NetBSD ELF uses SVR4-style shared libraries. */
- set_gdbarch_in_solib_call_trampoline (gdbarch,
- generic_in_solib_call_trampoline);
- set_solib_svr4_fetch_link_map_offsets (gdbarch,
- nbsd_ilp32_solib_svr4_fetch_link_map_offsets);
+ set_solib_svr4_fetch_link_map_offsets
+ (gdbarch, svr4_ilp32_fetch_link_map_offsets);
/* NetBSD ELF uses -fpcc-struct-return by default. */
tdep->struct_return = pcc_struct_return;
-
- /* We support the SSE registers on NetBSD ELF. */
- tdep->num_xmm_regs = I386_NUM_XREGS - 1;
- set_gdbarch_num_regs (gdbarch, I386_NUM_GREGS + I386_NUM_FREGS
- + I386_NUM_XREGS);
}
+/* Provide a prototype to silence -Wmissing-prototypes. */
+extern initialize_file_ftype _initialize_i386nbsd_tdep;
+
void
_initialize_i386nbsd_tdep (void)
{
- add_core_fns (&i386nbsd_core_fns);
- add_core_fns (&i386nbsd_elfcore_fns);
-
- gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_NETBSD_AOUT,
- i386nbsd_init_abi);
gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_NETBSD_ELF,
i386nbsdelf_init_abi);
}