X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fmipsnbsd-tdep.c;h=97421504064225f471027e1b81fa5f5eefd16f83;hb=40c1a0073715c1e3f93afc83edac8396eb362a98;hp=114a3745d7fecd9a61b589c52c8890eb29759512;hpb=f561f0263002fbd950e66676a666ee5f46483841;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/mipsnbsd-tdep.c b/gdb/mipsnbsd-tdep.c
index 114a3745d7..9742150406 100644
--- a/gdb/mipsnbsd-tdep.c
+++ b/gdb/mipsnbsd-tdep.c
@@ -1,12 +1,14 @@
-/* Target-dependent code for MIPS systems running NetBSD.
- Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Target-dependent code for NetBSD/mips.
+
+ Copyright (C) 2002-2014 Free Software Foundation, Inc.
+
Contributed by Wasabi Systems, 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,
@@ -15,146 +17,201 @@
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 "gdbcore.h"
#include "regcache.h"
+#include "regset.h"
#include "target.h"
#include "value.h"
#include "osabi.h"
+#include "gdb_assert.h"
+#include
+
#include "nbsd-tdep.h"
#include "mipsnbsd-tdep.h"
#include "mips-tdep.h"
#include "solib-svr4.h"
+/* Shorthand for some register numbers used below. */
+#define MIPS_PC_REGNUM MIPS_EMBED_PC_REGNUM
+#define MIPS_FP0_REGNUM MIPS_EMBED_FP0_REGNUM
+#define MIPS_FSR_REGNUM MIPS_EMBED_FP0_REGNUM + 32
+
+/* Core file support. */
+
+/* Number of registers in `struct reg' from . */
+#define MIPSNBSD_NUM_GREGS 38
+
+/* Number of registers in `struct fpreg' from . */
+#define MIPSNBSD_NUM_FPREGS 33
+
+/* Supply register REGNUM from the buffer specified by FPREGS and LEN
+ in the floating-point register set REGSET to register cache
+ REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */
+
+static void
+mipsnbsd_supply_fpregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *fpregs, size_t len)
+{
+ size_t regsize = mips_isa_regsize (get_regcache_arch (regcache));
+ const char *regs = fpregs;
+ int i;
+
+ gdb_assert (len >= MIPSNBSD_NUM_FPREGS * regsize);
+
+ for (i = MIPS_FP0_REGNUM; i <= MIPS_FSR_REGNUM; i++)
+ {
+ if (regnum == i || regnum == -1)
+ regcache_raw_supply (regcache, i,
+ regs + (i - MIPS_FP0_REGNUM) * regsize);
+ }
+}
+
+/* Supply register REGNUM from the buffer specified by GREGS and LEN
+ in the general-purpose register set REGSET to register cache
+ REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */
+
+static void
+mipsnbsd_supply_gregset (const struct regset *regset,
+ struct regcache *regcache, int regnum,
+ const void *gregs, size_t len)
+{
+ size_t regsize = mips_isa_regsize (get_regcache_arch (regcache));
+ const char *regs = gregs;
+ int i;
+
+ gdb_assert (len >= MIPSNBSD_NUM_GREGS * regsize);
+
+ for (i = 0; i <= MIPS_PC_REGNUM; i++)
+ {
+ if (regnum == i || regnum == -1)
+ regcache_raw_supply (regcache, i, regs + i * regsize);
+ }
+
+ if (len >= (MIPSNBSD_NUM_GREGS + MIPSNBSD_NUM_FPREGS) * regsize)
+ {
+ regs += MIPSNBSD_NUM_GREGS * regsize;
+ len -= MIPSNBSD_NUM_GREGS * regsize;
+ mipsnbsd_supply_fpregset (regset, regcache, regnum, regs, len);
+ }
+}
+
+/* NetBSD/mips register sets. */
+
+static struct regset mipsnbsd_gregset =
+{
+ NULL,
+ mipsnbsd_supply_gregset
+};
+
+static struct regset mipsnbsd_fpregset =
+{
+ NULL,
+ mipsnbsd_supply_fpregset
+};
+
+/* Return the appropriate register set for the core section identified
+ by SECT_NAME and SECT_SIZE. */
+
+static const struct regset *
+mipsnbsd_regset_from_core_section (struct gdbarch *gdbarch,
+ const char *sect_name, size_t sect_size)
+{
+ size_t regsize = mips_isa_regsize (gdbarch);
+
+ if (strcmp (sect_name, ".reg") == 0
+ && sect_size >= MIPSNBSD_NUM_GREGS * regsize)
+ return &mipsnbsd_gregset;
+
+ if (strcmp (sect_name, ".reg2") == 0
+ && sect_size >= MIPSNBSD_NUM_FPREGS * regsize)
+ return &mipsnbsd_fpregset;
+
+ return NULL;
+}
+
+
/* Conveniently, GDB uses the same register numbering as the
ptrace register structure used by NetBSD/mips. */
void
-mipsnbsd_supply_reg (char *regs, int regno)
+mipsnbsd_supply_reg (struct regcache *regcache, const char *regs, int regno)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
int i;
- for (i = 0; i <= PC_REGNUM; i++)
+ for (i = 0; i <= gdbarch_pc_regnum (gdbarch); i++)
{
if (regno == i || regno == -1)
{
- if (CANNOT_FETCH_REGISTER (i))
- supply_register (i, NULL);
+ if (gdbarch_cannot_fetch_register (gdbarch, i))
+ regcache_raw_supply (regcache, i, NULL);
else
- supply_register (i, regs + (i * mips_regsize (current_gdbarch)));
+ regcache_raw_supply (regcache, i,
+ regs + (i * mips_isa_regsize (gdbarch)));
}
}
}
void
-mipsnbsd_fill_reg (char *regs, int regno)
+mipsnbsd_fill_reg (const struct regcache *regcache, char *regs, int regno)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
int i;
- for (i = 0; i <= PC_REGNUM; i++)
- if ((regno == i || regno == -1) && ! CANNOT_STORE_REGISTER (i))
- regcache_collect (i, regs + (i * mips_regsize (current_gdbarch)));
+ for (i = 0; i <= gdbarch_pc_regnum (gdbarch); i++)
+ if ((regno == i || regno == -1)
+ && ! gdbarch_cannot_store_register (gdbarch, i))
+ regcache_raw_collect (regcache, i,
+ regs + (i * mips_isa_regsize (gdbarch)));
}
void
-mipsnbsd_supply_fpreg (char *fpregs, int regno)
+mipsnbsd_supply_fpreg (struct regcache *regcache,
+ const char *fpregs, int regno)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
int i;
- for (i = FP0_REGNUM;
- i <= mips_regnum (current_gdbarch)->fp_implementation_revision;
+ for (i = gdbarch_fp0_regnum (gdbarch);
+ i <= mips_regnum (gdbarch)->fp_implementation_revision;
i++)
{
if (regno == i || regno == -1)
{
- if (CANNOT_FETCH_REGISTER (i))
- supply_register (i, NULL);
+ if (gdbarch_cannot_fetch_register (gdbarch, i))
+ regcache_raw_supply (regcache, i, NULL);
else
- supply_register (i, fpregs + ((i - FP0_REGNUM) * mips_regsize (current_gdbarch)));
+ regcache_raw_supply (regcache, i,
+ fpregs
+ + ((i - gdbarch_fp0_regnum (gdbarch))
+ * mips_isa_regsize (gdbarch)));
}
}
}
void
-mipsnbsd_fill_fpreg (char *fpregs, int regno)
+mipsnbsd_fill_fpreg (const struct regcache *regcache, char *fpregs, int regno)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
int i;
- for (i = FP0_REGNUM; i <= mips_regnum (current_gdbarch)->fp_control_status;
+ for (i = gdbarch_fp0_regnum (gdbarch);
+ i <= mips_regnum (gdbarch)->fp_control_status;
i++)
- if ((regno == i || regno == -1) && ! CANNOT_STORE_REGISTER (i))
- regcache_collect (i, fpregs + ((i - FP0_REGNUM) * mips_regsize (current_gdbarch)));
+ if ((regno == i || regno == -1)
+ && ! gdbarch_cannot_store_register (gdbarch, i))
+ regcache_raw_collect (regcache, i,
+ fpregs + ((i - gdbarch_fp0_regnum (gdbarch))
+ * mips_isa_regsize (gdbarch)));
}
-static void
-fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
- CORE_ADDR ignore)
-{
- char *regs, *fpregs;
-
- /* We get everything from one section. */
- if (which != 0)
- return;
-
- regs = core_reg_sect;
- fpregs = core_reg_sect + SIZEOF_STRUCT_REG;
-
- /* Integer registers. */
- mipsnbsd_supply_reg (regs, -1);
-
- /* Floating point registers. */
- mipsnbsd_supply_fpreg (fpregs, -1);
-}
-
-static void
-fetch_elfcore_registers (char *core_reg_sect, unsigned core_reg_size, int which,
- CORE_ADDR ignore)
-{
- switch (which)
- {
- case 0: /* Integer registers. */
- if (core_reg_size != SIZEOF_STRUCT_REG)
- warning ("Wrong size register set in core file.");
- else
- mipsnbsd_supply_reg (core_reg_sect, -1);
- break;
-
- case 2: /* Floating point registers. */
- if (core_reg_size != SIZEOF_STRUCT_FPREG)
- warning ("Wrong size register set in core file.");
- else
- mipsnbsd_supply_fpreg (core_reg_sect, -1);
- break;
-
- default:
- /* Don't know what kind of register request this is; just ignore it. */
- break;
- }
-}
-
-static struct core_fns mipsnbsd_core_fns =
-{
- bfd_target_unknown_flavour, /* core_flavour */
- default_check_format, /* check_format */
- default_core_sniffer, /* core_sniffer */
- fetch_core_registers, /* core_read_registers */
- NULL /* next */
-};
-
-static struct core_fns mipsnbsd_elfcore_fns =
-{
- bfd_target_elf_flavour, /* core_flavour */
- default_check_format, /* check_format */
- default_core_sniffer, /* core_sniffer */
- fetch_elfcore_registers, /* core_read_registers */
- NULL /* next */
-};
+#if 0
/* Under NetBSD/mips, signal handler invocations can be identified by the
designated code sequence that is used to return from a signal handler.
@@ -189,94 +246,62 @@ static const unsigned char sigtramp_retcode_mipseb[RETCODE_SIZE] =
0x00, 0x00, 0x00, 0x0c, /* syscall */
};
-static LONGEST
-mipsnbsd_sigtramp_offset (CORE_ADDR pc)
-{
- const char *retcode = TARGET_BYTE_ORDER == BFD_ENDIAN_BIG
- ? sigtramp_retcode_mipseb : sigtramp_retcode_mipsel;
- unsigned char ret[RETCODE_SIZE], w[4];
- LONGEST off;
- int i;
-
- if (read_memory_nobpt (pc, (char *) w, sizeof (w)) != 0)
- return -1;
-
- for (i = 0; i < RETCODE_NWORDS; i++)
- {
- if (memcmp (w, retcode + (i * 4), 4) == 0)
- break;
- }
- if (i == RETCODE_NWORDS)
- return -1;
-
- off = i * 4;
- pc -= off;
-
- if (read_memory_nobpt (pc, (char *) ret, sizeof (ret)) != 0)
- return -1;
-
- if (memcmp (ret, retcode, RETCODE_SIZE) == 0)
- return off;
-
- return -1;
-}
-
-static int
-mipsnbsd_pc_in_sigtramp (CORE_ADDR pc, char *func_name)
-{
- return (nbsd_pc_in_sigtramp (pc, func_name)
- || mipsnbsd_sigtramp_offset (pc) >= 0);
-}
+#endif
/* Figure out where the longjmp will land. We expect that we have
- just entered longjmp and haven't yet setup the stack frame, so
- the args are still in the argument regs. A0_REGNUM points at the
+ just entered longjmp and haven't yet setup the stack frame, so the
+ args are still in the argument regs. MIPS_A0_REGNUM points at the
jmp_buf structure from which we extract the PC that we will land
at. The PC is copied into *pc. This routine returns true on
success. */
#define NBSD_MIPS_JB_PC (2 * 4)
-#define NBSD_MIPS_JB_ELEMENT_SIZE mips_regsize (current_gdbarch)
-#define NBSD_MIPS_JB_OFFSET (NBSD_MIPS_JB_PC * \
- NBSD_MIPS_JB_ELEMENT_SIZE)
+#define NBSD_MIPS_JB_ELEMENT_SIZE(gdbarch) mips_isa_regsize (gdbarch)
+#define NBSD_MIPS_JB_OFFSET(gdbarch) (NBSD_MIPS_JB_PC * \
+ NBSD_MIPS_JB_ELEMENT_SIZE (gdbarch))
static int
-mipsnbsd_get_longjmp_target (CORE_ADDR *pc)
+mipsnbsd_get_longjmp_target (struct frame_info *frame, CORE_ADDR *pc)
{
+ struct gdbarch *gdbarch = get_frame_arch (frame);
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
CORE_ADDR jb_addr;
- char *buf;
+ gdb_byte *buf;
- buf = alloca (NBSD_MIPS_JB_ELEMENT_SIZE);
+ buf = alloca (NBSD_MIPS_JB_ELEMENT_SIZE (gdbarch));
- jb_addr = read_register (A0_REGNUM);
+ jb_addr = get_frame_register_unsigned (frame, MIPS_A0_REGNUM);
- if (target_read_memory (jb_addr + NBSD_MIPS_JB_OFFSET, buf,
- NBSD_MIPS_JB_ELEMENT_SIZE))
+ if (target_read_memory (jb_addr + NBSD_MIPS_JB_OFFSET (gdbarch), buf,
+ NBSD_MIPS_JB_ELEMENT_SIZE (gdbarch)))
return 0;
- *pc = extract_unsigned_integer (buf, NBSD_MIPS_JB_ELEMENT_SIZE);
-
+ *pc = extract_unsigned_integer (buf, NBSD_MIPS_JB_ELEMENT_SIZE (gdbarch),
+ byte_order);
return 1;
}
static int
-mipsnbsd_cannot_fetch_register (int regno)
+mipsnbsd_cannot_fetch_register (struct gdbarch *gdbarch, int regno)
{
- return (regno == ZERO_REGNUM
- || regno == mips_regnum (current_gdbarch)->fp_implementation_revision);
+ return (regno == MIPS_ZERO_REGNUM
+ || regno == mips_regnum (gdbarch)->fp_implementation_revision);
}
static int
-mipsnbsd_cannot_store_register (int regno)
+mipsnbsd_cannot_store_register (struct gdbarch *gdbarch, int regno)
{
- return (regno == ZERO_REGNUM
- || regno == mips_regnum (current_gdbarch)->fp_implementation_revision);
+ return (regno == MIPS_ZERO_REGNUM
+ || regno == mips_regnum (gdbarch)->fp_implementation_revision);
}
-/* NetBSD/mips uses a slightly different link_map structure from the
+/* Shared library support. */
+
+/* NetBSD/mips uses a slightly different `struct link_map' than the
other NetBSD platforms. */
+
static struct link_map_offsets *
-mipsnbsd_ilp32_solib_svr4_fetch_link_map_offsets (void)
+mipsnbsd_ilp32_fetch_link_map_offsets (void)
{
static struct link_map_offsets lmo;
static struct link_map_offsets *lmp = NULL;
@@ -285,31 +310,26 @@ mipsnbsd_ilp32_solib_svr4_fetch_link_map_offsets (void)
{
lmp = &lmo;
- lmo.r_debug_size = 16;
-
+ lmo.r_version_offset = 0;
+ lmo.r_version_size = 4;
lmo.r_map_offset = 4;
- lmo.r_map_size = 4;
+ lmo.r_brk_offset = 8;
+ lmo.r_ldsomap_offset = -1;
+ /* Everything we need is in the first 24 bytes. */
lmo.link_map_size = 24;
-
- lmo.l_addr_offset = 0;
- lmo.l_addr_size = 4;
-
+ lmo.l_addr_offset = 4;
lmo.l_name_offset = 8;
- lmo.l_name_size = 4;
-
+ lmo.l_ld_offset = 12;
lmo.l_next_offset = 16;
- lmo.l_next_size = 4;
-
lmo.l_prev_offset = 20;
- lmo.l_prev_size = 4;
}
return lmp;
}
static struct link_map_offsets *
-mipsnbsd_lp64_solib_svr4_fetch_link_map_offsets (void)
+mipsnbsd_lp64_fetch_link_map_offsets (void)
{
static struct link_map_offsets lmo;
static struct link_map_offsets *lmp = NULL;
@@ -318,34 +338,31 @@ mipsnbsd_lp64_solib_svr4_fetch_link_map_offsets (void)
{
lmp = &lmo;
- lmo.r_debug_size = 32;
-
- lmo.r_map_offset = 8;
- lmo.r_map_size = 8;
+ lmo.r_version_offset = 0;
+ lmo.r_version_size = 4;
+ lmo.r_map_offset = 8;
+ lmo.r_brk_offset = 16;
+ lmo.r_ldsomap_offset = -1;
+ /* Everything we need is in the first 40 bytes. */
lmo.link_map_size = 48;
-
lmo.l_addr_offset = 0;
- lmo.l_addr_size = 8;
-
lmo.l_name_offset = 16;
- lmo.l_name_size = 8;
-
+ lmo.l_ld_offset = 24;
lmo.l_next_offset = 32;
- lmo.l_next_size = 8;
-
lmo.l_prev_offset = 40;
- lmo.l_prev_size = 8;
}
return lmp;
}
+
static void
mipsnbsd_init_abi (struct gdbarch_info info,
struct gdbarch *gdbarch)
{
- set_gdbarch_deprecated_pc_in_sigtramp (gdbarch, mipsnbsd_pc_in_sigtramp);
+ set_gdbarch_regset_from_core_section
+ (gdbarch, mipsnbsd_regset_from_core_section);
set_gdbarch_get_longjmp_target (gdbarch, mipsnbsd_get_longjmp_target);
@@ -354,18 +371,20 @@ mipsnbsd_init_abi (struct gdbarch_info info,
set_gdbarch_software_single_step (gdbarch, mips_software_single_step);
- set_solib_svr4_fetch_link_map_offsets (gdbarch,
- gdbarch_ptr_bit (gdbarch) == 32 ?
- mipsnbsd_ilp32_solib_svr4_fetch_link_map_offsets :
- mipsnbsd_lp64_solib_svr4_fetch_link_map_offsets);
+ /* NetBSD/mips has SVR4-style shared libraries. */
+ set_solib_svr4_fetch_link_map_offsets
+ (gdbarch, (gdbarch_ptr_bit (gdbarch) == 32 ?
+ mipsnbsd_ilp32_fetch_link_map_offsets :
+ mipsnbsd_lp64_fetch_link_map_offsets));
}
+
+
+/* Provide a prototype to silence -Wmissing-prototypes. */
+extern initialize_file_ftype _initialize_mipsnbsd_tdep;
void
_initialize_mipsnbsd_tdep (void)
{
gdbarch_register_osabi (bfd_arch_mips, 0, GDB_OSABI_NETBSD_ELF,
mipsnbsd_init_abi);
-
- add_core_fns (&mipsnbsd_core_fns);
- add_core_fns (&mipsnbsd_elfcore_fns);
}