X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmips-linux-tdep.c;h=be346d75844e2efb52f99a57fb27153f0812fb76;hb=025bb325db8dce957db69eaf148c5bec373d4bb6;hp=dec2f4215e6abd3c58051e16b75fc382eb0c6cfc;hpb=dda0c97e687c8545e0feee0f4afe6b0041938ed7;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c index dec2f4215e..be346d7584 100644 --- a/gdb/mips-linux-tdep.c +++ b/gdb/mips-linux-tdep.c @@ -1,13 +1,13 @@ /* Target-dependent code for GNU/Linux on MIPS processors. - Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007 + Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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" @@ -34,8 +32,16 @@ #include "tramp-frame.h" #include "gdbtypes.h" #include "solib.h" +#include "solib-svr4.h" +#include "solist.h" #include "symtab.h" +#include "target-descriptions.h" +#include "regset.h" #include "mips-linux-tdep.h" +#include "glibc-tdep.h" +#include "linux-tdep.h" + +static struct target_so_ops mips_svr4_so_ops; /* Figure out where the longjmp will land. We expect the first arg to be a pointer to the jmp_buf structure @@ -47,19 +53,23 @@ #define MIPS_LINUX_JB_PC 0 static int -mips_linux_get_longjmp_target (CORE_ADDR *pc) +mips_linux_get_longjmp_target (struct frame_info *frame, CORE_ADDR *pc) { CORE_ADDR jb_addr; - char buf[TARGET_PTR_BIT / TARGET_CHAR_BIT]; + struct gdbarch *gdbarch = get_frame_arch (frame); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); + char buf[gdbarch_ptr_bit (gdbarch) / TARGET_CHAR_BIT]; - jb_addr = read_register (MIPS_A0_REGNUM); + jb_addr = get_frame_register_unsigned (frame, MIPS_A0_REGNUM); if (target_read_memory (jb_addr - + MIPS_LINUX_JB_PC * MIPS_LINUX_JB_ELEMENT_SIZE, - buf, TARGET_PTR_BIT / TARGET_CHAR_BIT)) + + MIPS_LINUX_JB_PC * MIPS_LINUX_JB_ELEMENT_SIZE, + buf, gdbarch_ptr_bit (gdbarch) / TARGET_CHAR_BIT)) return 0; - *pc = extract_unsigned_integer (buf, TARGET_PTR_BIT / TARGET_CHAR_BIT); + *pc = extract_unsigned_integer (buf, + gdbarch_ptr_bit (gdbarch) / TARGET_CHAR_BIT, + byte_order); return 1; } @@ -69,54 +79,72 @@ mips_linux_get_longjmp_target (CORE_ADDR *pc) is 8. */ static void -supply_32bit_reg (int regnum, const void *addr) +supply_32bit_reg (struct regcache *regcache, int regnum, const void *addr) { + struct gdbarch *gdbarch = get_regcache_arch (regcache); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); gdb_byte buf[MAX_REGISTER_SIZE]; - store_signed_integer (buf, register_size (current_gdbarch, regnum), - extract_signed_integer (addr, 4)); - regcache_raw_supply (current_regcache, regnum, buf); + store_signed_integer (buf, register_size (gdbarch, regnum), byte_order, + extract_signed_integer (addr, 4, byte_order)); + regcache_raw_supply (regcache, regnum, buf); } /* Unpack an elf_gregset_t into GDB's register cache. */ void -mips_supply_gregset (mips_elf_gregset_t *gregsetp) +mips_supply_gregset (struct regcache *regcache, + const mips_elf_gregset_t *gregsetp) { int regi; - mips_elf_greg_t *regp = *gregsetp; + const mips_elf_greg_t *regp = *gregsetp; char zerobuf[MAX_REGISTER_SIZE]; + struct gdbarch *gdbarch = get_regcache_arch (regcache); memset (zerobuf, 0, MAX_REGISTER_SIZE); - for (regi = EF_REG0; regi <= EF_REG31; regi++) - supply_32bit_reg ((regi - EF_REG0), (char *)(regp + regi)); + for (regi = EF_REG0 + 1; regi <= EF_REG31; regi++) + supply_32bit_reg (regcache, regi - EF_REG0, regp + regi); + + if (mips_linux_restart_reg_p (gdbarch)) + supply_32bit_reg (regcache, MIPS_RESTART_REGNUM, regp + EF_REG0); - supply_32bit_reg (mips_regnum (current_gdbarch)->lo, - (char *)(regp + EF_LO)); - supply_32bit_reg (mips_regnum (current_gdbarch)->hi, - (char *)(regp + EF_HI)); + supply_32bit_reg (regcache, mips_regnum (gdbarch)->lo, regp + EF_LO); + supply_32bit_reg (regcache, mips_regnum (gdbarch)->hi, regp + EF_HI); - supply_32bit_reg (mips_regnum (current_gdbarch)->pc, - (char *)(regp + EF_CP0_EPC)); - supply_32bit_reg (mips_regnum (current_gdbarch)->badvaddr, - (char *)(regp + EF_CP0_BADVADDR)); - supply_32bit_reg (MIPS_PS_REGNUM, (char *)(regp + EF_CP0_STATUS)); - supply_32bit_reg (mips_regnum (current_gdbarch)->cause, - (char *)(regp + EF_CP0_CAUSE)); + supply_32bit_reg (regcache, mips_regnum (gdbarch)->pc, + regp + EF_CP0_EPC); + supply_32bit_reg (regcache, mips_regnum (gdbarch)->badvaddr, + regp + EF_CP0_BADVADDR); + supply_32bit_reg (regcache, MIPS_PS_REGNUM, regp + EF_CP0_STATUS); + supply_32bit_reg (regcache, mips_regnum (gdbarch)->cause, + regp + EF_CP0_CAUSE); /* Fill inaccessible registers with zero. */ - regcache_raw_supply (current_regcache, MIPS_UNUSED_REGNUM, zerobuf); + regcache_raw_supply (regcache, MIPS_ZERO_REGNUM, zerobuf); + regcache_raw_supply (regcache, MIPS_UNUSED_REGNUM, zerobuf); for (regi = MIPS_FIRST_EMBED_REGNUM; - regi < MIPS_LAST_EMBED_REGNUM; + regi <= MIPS_LAST_EMBED_REGNUM; regi++) - regcache_raw_supply (current_regcache, regi, zerobuf); + regcache_raw_supply (regcache, regi, zerobuf); +} + +static void +mips_supply_gregset_wrapper (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *gregs, size_t len) +{ + gdb_assert (len == sizeof (mips_elf_gregset_t)); + + mips_supply_gregset (regcache, (const mips_elf_gregset_t *)gregs); } /* Pack our registers (or one register) into an elf_gregset_t. */ void -mips_fill_gregset (mips_elf_gregset_t *gregsetp, int regno) +mips_fill_gregset (const struct regcache *regcache, + mips_elf_gregset_t *gregsetp, int regno) { + struct gdbarch *gdbarch = get_regcache_arch (regcache); int regaddr, regi; mips_elf_greg_t *regp = *gregsetp; void *dst; @@ -124,100 +152,140 @@ mips_fill_gregset (mips_elf_gregset_t *gregsetp, int regno) if (regno == -1) { memset (regp, 0, sizeof (mips_elf_gregset_t)); - for (regi = 0; regi < 32; regi++) - mips_fill_gregset (gregsetp, regi); - mips_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->lo); - mips_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->hi); - mips_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->pc); - mips_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->badvaddr); - mips_fill_gregset (gregsetp, MIPS_PS_REGNUM); - mips_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->cause); - + for (regi = 1; regi < 32; regi++) + mips_fill_gregset (regcache, gregsetp, regi); + mips_fill_gregset (regcache, gregsetp, mips_regnum (gdbarch)->lo); + mips_fill_gregset (regcache, gregsetp, mips_regnum (gdbarch)->hi); + mips_fill_gregset (regcache, gregsetp, mips_regnum (gdbarch)->pc); + mips_fill_gregset (regcache, gregsetp, mips_regnum (gdbarch)->badvaddr); + mips_fill_gregset (regcache, gregsetp, MIPS_PS_REGNUM); + mips_fill_gregset (regcache, gregsetp, mips_regnum (gdbarch)->cause); + mips_fill_gregset (regcache, gregsetp, MIPS_RESTART_REGNUM); return; } - if (regno < 32) + if (regno > 0 && regno < 32) { dst = regp + regno + EF_REG0; - regcache_raw_collect (current_regcache, regno, dst); + regcache_raw_collect (regcache, regno, dst); return; } - if (regno == mips_regnum (current_gdbarch)->lo) - regaddr = EF_LO; - else if (regno == mips_regnum (current_gdbarch)->hi) + if (regno == mips_regnum (gdbarch)->lo) + regaddr = EF_LO; + else if (regno == mips_regnum (gdbarch)->hi) regaddr = EF_HI; - else if (regno == mips_regnum (current_gdbarch)->pc) + else if (regno == mips_regnum (gdbarch)->pc) regaddr = EF_CP0_EPC; - else if (regno == mips_regnum (current_gdbarch)->badvaddr) + else if (regno == mips_regnum (gdbarch)->badvaddr) regaddr = EF_CP0_BADVADDR; else if (regno == MIPS_PS_REGNUM) regaddr = EF_CP0_STATUS; - else if (regno == mips_regnum (current_gdbarch)->cause) + else if (regno == mips_regnum (gdbarch)->cause) regaddr = EF_CP0_CAUSE; + else if (mips_linux_restart_reg_p (gdbarch) + && regno == MIPS_RESTART_REGNUM) + regaddr = EF_REG0; else regaddr = -1; if (regaddr != -1) { dst = regp + regaddr; - regcache_raw_collect (current_regcache, regno, dst); + regcache_raw_collect (regcache, regno, dst); } } +static void +mips_fill_gregset_wrapper (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *gregs, size_t len) +{ + gdb_assert (len == sizeof (mips_elf_gregset_t)); + + mips_fill_gregset (regcache, (mips_elf_gregset_t *)gregs, regnum); +} + /* Likewise, unpack an elf_fpregset_t. */ void -mips_supply_fpregset (mips_elf_fpregset_t *fpregsetp) +mips_supply_fpregset (struct regcache *regcache, + const mips_elf_fpregset_t *fpregsetp) { + struct gdbarch *gdbarch = get_regcache_arch (regcache); int regi; char zerobuf[MAX_REGISTER_SIZE]; memset (zerobuf, 0, MAX_REGISTER_SIZE); for (regi = 0; regi < 32; regi++) - regcache_raw_supply (current_regcache, FP0_REGNUM + regi, - (char *)(*fpregsetp + regi)); + regcache_raw_supply (regcache, + gdbarch_fp0_regnum (gdbarch) + regi, + *fpregsetp + regi); - regcache_raw_supply (current_regcache, - mips_regnum (current_gdbarch)->fp_control_status, - (char *)(*fpregsetp + 32)); + regcache_raw_supply (regcache, + mips_regnum (gdbarch)->fp_control_status, + *fpregsetp + 32); /* FIXME: how can we supply FCRIR? The ABI doesn't tell us. */ - regcache_raw_supply (current_regcache, - mips_regnum (current_gdbarch)->fp_implementation_revision, + regcache_raw_supply (regcache, + mips_regnum (gdbarch)->fp_implementation_revision, zerobuf); } +static void +mips_supply_fpregset_wrapper (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *gregs, size_t len) +{ + gdb_assert (len == sizeof (mips_elf_fpregset_t)); + + mips_supply_fpregset (regcache, (const mips_elf_fpregset_t *)gregs); +} + /* Likewise, pack one or all floating point registers into an elf_fpregset_t. */ void -mips_fill_fpregset (mips_elf_fpregset_t *fpregsetp, int regno) +mips_fill_fpregset (const struct regcache *regcache, + mips_elf_fpregset_t *fpregsetp, int regno) { + struct gdbarch *gdbarch = get_regcache_arch (regcache); char *from, *to; - if ((regno >= FP0_REGNUM) && (regno < FP0_REGNUM + 32)) + if ((regno >= gdbarch_fp0_regnum (gdbarch)) + && (regno < gdbarch_fp0_regnum (gdbarch) + 32)) { - to = (char *) (*fpregsetp + regno - FP0_REGNUM); - regcache_raw_collect (current_regcache, regno, to); + to = (char *) (*fpregsetp + regno - gdbarch_fp0_regnum (gdbarch)); + regcache_raw_collect (regcache, regno, to); } - else if (regno == mips_regnum (current_gdbarch)->fp_control_status) + else if (regno == mips_regnum (gdbarch)->fp_control_status) { to = (char *) (*fpregsetp + 32); - regcache_raw_collect (current_regcache, regno, to); + regcache_raw_collect (regcache, regno, to); } else if (regno == -1) { int regi; for (regi = 0; regi < 32; regi++) - mips_fill_fpregset (fpregsetp, FP0_REGNUM + regi); - mips_fill_fpregset (fpregsetp, - mips_regnum (current_gdbarch)->fp_control_status); + mips_fill_fpregset (regcache, fpregsetp, + gdbarch_fp0_regnum (gdbarch) + regi); + mips_fill_fpregset (regcache, fpregsetp, + mips_regnum (gdbarch)->fp_control_status); } } +static void +mips_fill_fpregset_wrapper (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *gregs, size_t len) +{ + gdb_assert (len == sizeof (mips_elf_fpregset_t)); + + mips_fill_fpregset (regcache, (mips_elf_fpregset_t *)gregs, regnum); +} + /* Support for 64-bit ABIs. */ /* Figure out where the longjmp will land. @@ -231,19 +299,24 @@ mips_fill_fpregset (mips_elf_fpregset_t *fpregsetp, int regno) #define MIPS64_LINUX_JB_PC 0 static int -mips64_linux_get_longjmp_target (CORE_ADDR *pc) +mips64_linux_get_longjmp_target (struct frame_info *frame, CORE_ADDR *pc) { CORE_ADDR jb_addr; - void *buf = alloca (TARGET_PTR_BIT / TARGET_CHAR_BIT); - int element_size = TARGET_PTR_BIT == 32 ? 4 : 8; + struct gdbarch *gdbarch = get_frame_arch (frame); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); + void *buf = alloca (gdbarch_ptr_bit (gdbarch) / TARGET_CHAR_BIT); + int element_size = gdbarch_ptr_bit (gdbarch) == 32 ? 4 : 8; - jb_addr = read_register (MIPS_A0_REGNUM); + jb_addr = get_frame_register_unsigned (frame, MIPS_A0_REGNUM); if (target_read_memory (jb_addr + MIPS64_LINUX_JB_PC * element_size, - buf, TARGET_PTR_BIT / TARGET_CHAR_BIT)) + buf, + gdbarch_ptr_bit (gdbarch) / TARGET_CHAR_BIT)) return 0; - *pc = extract_unsigned_integer (buf, TARGET_PTR_BIT / TARGET_CHAR_BIT); + *pc = extract_unsigned_integer (buf, + gdbarch_ptr_bit (gdbarch) / TARGET_CHAR_BIT, + byte_order); return 1; } @@ -254,92 +327,117 @@ mips64_linux_get_longjmp_target (CORE_ADDR *pc) /* Supply a 64-bit register. */ -void -supply_64bit_reg (int regnum, const gdb_byte *buf) +static void +supply_64bit_reg (struct regcache *regcache, int regnum, + const gdb_byte *buf) { - if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_BIG - && register_size (current_gdbarch, regnum) == 4) - regcache_raw_supply (current_regcache, regnum, buf + 4); + struct gdbarch *gdbarch = get_regcache_arch (regcache); + if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG + && register_size (gdbarch, regnum) == 4) + regcache_raw_supply (regcache, regnum, buf + 4); else - regcache_raw_supply (current_regcache, regnum, buf); + regcache_raw_supply (regcache, regnum, buf); } /* Unpack a 64-bit elf_gregset_t into GDB's register cache. */ void -mips64_supply_gregset (mips64_elf_gregset_t *gregsetp) +mips64_supply_gregset (struct regcache *regcache, + const mips64_elf_gregset_t *gregsetp) { int regi; - mips64_elf_greg_t *regp = *gregsetp; + const mips64_elf_greg_t *regp = *gregsetp; gdb_byte zerobuf[MAX_REGISTER_SIZE]; + struct gdbarch *gdbarch = get_regcache_arch (regcache); memset (zerobuf, 0, MAX_REGISTER_SIZE); - for (regi = MIPS64_EF_REG0; regi <= MIPS64_EF_REG31; regi++) - supply_64bit_reg (regi - MIPS64_EF_REG0, (gdb_byte *)(regp + regi)); + for (regi = MIPS64_EF_REG0 + 1; regi <= MIPS64_EF_REG31; regi++) + supply_64bit_reg (regcache, regi - MIPS64_EF_REG0, + (const gdb_byte *)(regp + regi)); + + if (mips_linux_restart_reg_p (gdbarch)) + supply_64bit_reg (regcache, MIPS_RESTART_REGNUM, + (const gdb_byte *)(regp + MIPS64_EF_REG0)); - supply_64bit_reg (mips_regnum (current_gdbarch)->lo, - (gdb_byte *) (regp + MIPS64_EF_LO)); - supply_64bit_reg (mips_regnum (current_gdbarch)->hi, - (gdb_byte *) (regp + MIPS64_EF_HI)); + supply_64bit_reg (regcache, mips_regnum (gdbarch)->lo, + (const gdb_byte *) (regp + MIPS64_EF_LO)); + supply_64bit_reg (regcache, mips_regnum (gdbarch)->hi, + (const gdb_byte *) (regp + MIPS64_EF_HI)); - supply_64bit_reg (mips_regnum (current_gdbarch)->pc, - (gdb_byte *) (regp + MIPS64_EF_CP0_EPC)); - supply_64bit_reg (mips_regnum (current_gdbarch)->badvaddr, - (gdb_byte *) (regp + MIPS64_EF_CP0_BADVADDR)); - supply_64bit_reg (MIPS_PS_REGNUM, - (gdb_byte *) (regp + MIPS64_EF_CP0_STATUS)); - supply_64bit_reg (mips_regnum (current_gdbarch)->cause, - (gdb_byte *) (regp + MIPS64_EF_CP0_CAUSE)); + supply_64bit_reg (regcache, mips_regnum (gdbarch)->pc, + (const gdb_byte *) (regp + MIPS64_EF_CP0_EPC)); + supply_64bit_reg (regcache, mips_regnum (gdbarch)->badvaddr, + (const gdb_byte *) (regp + MIPS64_EF_CP0_BADVADDR)); + supply_64bit_reg (regcache, MIPS_PS_REGNUM, + (const gdb_byte *) (regp + MIPS64_EF_CP0_STATUS)); + supply_64bit_reg (regcache, mips_regnum (gdbarch)->cause, + (const gdb_byte *) (regp + MIPS64_EF_CP0_CAUSE)); /* Fill inaccessible registers with zero. */ - regcache_raw_supply (current_regcache, MIPS_UNUSED_REGNUM, zerobuf); + regcache_raw_supply (regcache, MIPS_ZERO_REGNUM, zerobuf); + regcache_raw_supply (regcache, MIPS_UNUSED_REGNUM, zerobuf); for (regi = MIPS_FIRST_EMBED_REGNUM; - regi < MIPS_LAST_EMBED_REGNUM; + regi <= MIPS_LAST_EMBED_REGNUM; regi++) - regcache_raw_supply (current_regcache, regi, zerobuf); + regcache_raw_supply (regcache, regi, zerobuf); +} + +static void +mips64_supply_gregset_wrapper (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *gregs, size_t len) +{ + gdb_assert (len == sizeof (mips64_elf_gregset_t)); + + mips64_supply_gregset (regcache, (const mips64_elf_gregset_t *)gregs); } /* Pack our registers (or one register) into a 64-bit elf_gregset_t. */ void -mips64_fill_gregset (mips64_elf_gregset_t *gregsetp, int regno) +mips64_fill_gregset (const struct regcache *regcache, + mips64_elf_gregset_t *gregsetp, int regno) { + struct gdbarch *gdbarch = get_regcache_arch (regcache); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); int regaddr, regi; mips64_elf_greg_t *regp = *gregsetp; - void *src, *dst; + void *dst; if (regno == -1) { memset (regp, 0, sizeof (mips64_elf_gregset_t)); - for (regi = 0; regi < 32; regi++) - mips64_fill_gregset (gregsetp, regi); - mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->lo); - mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->hi); - mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->pc); - mips64_fill_gregset (gregsetp, - mips_regnum (current_gdbarch)->badvaddr); - mips64_fill_gregset (gregsetp, MIPS_PS_REGNUM); - mips64_fill_gregset (gregsetp, - mips_regnum (current_gdbarch)->cause); - + for (regi = 1; regi < 32; regi++) + mips64_fill_gregset (regcache, gregsetp, regi); + mips64_fill_gregset (regcache, gregsetp, mips_regnum (gdbarch)->lo); + mips64_fill_gregset (regcache, gregsetp, mips_regnum (gdbarch)->hi); + mips64_fill_gregset (regcache, gregsetp, mips_regnum (gdbarch)->pc); + mips64_fill_gregset (regcache, gregsetp, + mips_regnum (gdbarch)->badvaddr); + mips64_fill_gregset (regcache, gregsetp, MIPS_PS_REGNUM); + mips64_fill_gregset (regcache, gregsetp, mips_regnum (gdbarch)->cause); + mips64_fill_gregset (regcache, gregsetp, MIPS_RESTART_REGNUM); return; } - if (regno < 32) + if (regno > 0 && regno < 32) regaddr = regno + MIPS64_EF_REG0; - else if (regno == mips_regnum (current_gdbarch)->lo) + else if (regno == mips_regnum (gdbarch)->lo) regaddr = MIPS64_EF_LO; - else if (regno == mips_regnum (current_gdbarch)->hi) + else if (regno == mips_regnum (gdbarch)->hi) regaddr = MIPS64_EF_HI; - else if (regno == mips_regnum (current_gdbarch)->pc) + else if (regno == mips_regnum (gdbarch)->pc) regaddr = MIPS64_EF_CP0_EPC; - else if (regno == mips_regnum (current_gdbarch)->badvaddr) + else if (regno == mips_regnum (gdbarch)->badvaddr) regaddr = MIPS64_EF_CP0_BADVADDR; else if (regno == MIPS_PS_REGNUM) regaddr = MIPS64_EF_CP0_STATUS; - else if (regno == mips_regnum (current_gdbarch)->cause) + else if (regno == mips_regnum (gdbarch)->cause) regaddr = MIPS64_EF_CP0_CAUSE; + else if (mips_linux_restart_reg_p (gdbarch) + && regno == MIPS_RESTART_REGNUM) + regaddr = MIPS64_EF_REG0; else regaddr = -1; @@ -348,169 +446,232 @@ mips64_fill_gregset (mips64_elf_gregset_t *gregsetp, int regno) gdb_byte buf[MAX_REGISTER_SIZE]; LONGEST val; - regcache_raw_collect (current_regcache, regno, buf); - val = extract_signed_integer (buf, - register_size (current_gdbarch, regno)); + regcache_raw_collect (regcache, regno, buf); + val = extract_signed_integer (buf, register_size (gdbarch, regno), + byte_order); dst = regp + regaddr; - store_signed_integer (dst, 8, val); + store_signed_integer (dst, 8, byte_order, val); } } +static void +mips64_fill_gregset_wrapper (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *gregs, size_t len) +{ + gdb_assert (len == sizeof (mips64_elf_gregset_t)); + + mips64_fill_gregset (regcache, (mips64_elf_gregset_t *)gregs, regnum); +} + /* Likewise, unpack an elf_fpregset_t. */ void -mips64_supply_fpregset (mips64_elf_fpregset_t *fpregsetp) +mips64_supply_fpregset (struct regcache *regcache, + const mips64_elf_fpregset_t *fpregsetp) { + struct gdbarch *gdbarch = get_regcache_arch (regcache); int regi; /* See mips_linux_o32_sigframe_init for a description of the peculiar FP register layout. */ - if (register_size (current_gdbarch, FP0_REGNUM) == 4) + if (register_size (gdbarch, gdbarch_fp0_regnum (gdbarch)) == 4) for (regi = 0; regi < 32; regi++) { - gdb_byte *reg_ptr = (gdb_byte *) (*fpregsetp + (regi & ~1)); - if ((TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) != (regi & 1)) + const gdb_byte *reg_ptr = (const gdb_byte *)(*fpregsetp + (regi & ~1)); + if ((gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG) != (regi & 1)) reg_ptr += 4; - regcache_raw_supply (current_regcache, FP0_REGNUM + regi, reg_ptr); + regcache_raw_supply (regcache, + gdbarch_fp0_regnum (gdbarch) + regi, + reg_ptr); } else for (regi = 0; regi < 32; regi++) - regcache_raw_supply (current_regcache, FP0_REGNUM + regi, - (char *)(*fpregsetp + regi)); + regcache_raw_supply (regcache, + gdbarch_fp0_regnum (gdbarch) + regi, + (const char *)(*fpregsetp + regi)); - supply_32bit_reg (mips_regnum (current_gdbarch)->fp_control_status, - (gdb_byte *)(*fpregsetp + 32)); + supply_32bit_reg (regcache, mips_regnum (gdbarch)->fp_control_status, + (const gdb_byte *)(*fpregsetp + 32)); /* The ABI doesn't tell us how to supply FCRIR, and core dumps don't include it - but the result of PTRACE_GETFPREGS does. The best we can do is to assume that its value is present. */ - supply_32bit_reg (mips_regnum (current_gdbarch)->fp_implementation_revision, - (gdb_byte *)(*fpregsetp + 32) + 4); + supply_32bit_reg (regcache, + mips_regnum (gdbarch)->fp_implementation_revision, + (const gdb_byte *)(*fpregsetp + 32) + 4); +} + +static void +mips64_supply_fpregset_wrapper (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *gregs, size_t len) +{ + gdb_assert (len == sizeof (mips64_elf_fpregset_t)); + + mips64_supply_fpregset (regcache, (const mips64_elf_fpregset_t *)gregs); } /* Likewise, pack one or all floating point registers into an elf_fpregset_t. */ void -mips64_fill_fpregset (mips64_elf_fpregset_t *fpregsetp, int regno) +mips64_fill_fpregset (const struct regcache *regcache, + mips64_elf_fpregset_t *fpregsetp, int regno) { + struct gdbarch *gdbarch = get_regcache_arch (regcache); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); gdb_byte *to; - if ((regno >= FP0_REGNUM) && (regno < FP0_REGNUM + 32)) + if ((regno >= gdbarch_fp0_regnum (gdbarch)) + && (regno < gdbarch_fp0_regnum (gdbarch) + 32)) { /* See mips_linux_o32_sigframe_init for a description of the peculiar FP register layout. */ - if (register_size (current_gdbarch, regno) == 4) + if (register_size (gdbarch, regno) == 4) { - int regi = regno - FP0_REGNUM; + int regi = regno - gdbarch_fp0_regnum (gdbarch); to = (gdb_byte *) (*fpregsetp + (regi & ~1)); - if ((TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) != (regi & 1)) + if ((gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG) != (regi & 1)) to += 4; - regcache_raw_collect (current_regcache, regno, to); + regcache_raw_collect (regcache, regno, to); } else { - to = (gdb_byte *) (*fpregsetp + regno - FP0_REGNUM); - regcache_raw_collect (current_regcache, regno, to); + to = (gdb_byte *) (*fpregsetp + regno + - gdbarch_fp0_regnum (gdbarch)); + regcache_raw_collect (regcache, regno, to); } } - else if (regno == mips_regnum (current_gdbarch)->fp_control_status) + else if (regno == mips_regnum (gdbarch)->fp_control_status) { gdb_byte buf[MAX_REGISTER_SIZE]; LONGEST val; - regcache_raw_collect (current_regcache, regno, buf); - val = extract_signed_integer (buf, - register_size (current_gdbarch, regno)); + regcache_raw_collect (regcache, regno, buf); + val = extract_signed_integer (buf, register_size (gdbarch, regno), + byte_order); to = (gdb_byte *) (*fpregsetp + 32); - store_signed_integer (to, 4, val); + store_signed_integer (to, 4, byte_order, val); } - else if (regno == mips_regnum (current_gdbarch)->fp_implementation_revision) + else if (regno == mips_regnum (gdbarch)->fp_implementation_revision) { gdb_byte buf[MAX_REGISTER_SIZE]; LONGEST val; - regcache_raw_collect (current_regcache, regno, buf); - val = extract_signed_integer (buf, - register_size (current_gdbarch, regno)); + regcache_raw_collect (regcache, regno, buf); + val = extract_signed_integer (buf, register_size (gdbarch, regno), + byte_order); to = (gdb_byte *) (*fpregsetp + 32) + 4; - store_signed_integer (to, 4, val); + store_signed_integer (to, 4, byte_order, val); } else if (regno == -1) { int regi; for (regi = 0; regi < 32; regi++) - mips64_fill_fpregset (fpregsetp, FP0_REGNUM + regi); - mips64_fill_fpregset (fpregsetp, - mips_regnum (current_gdbarch)->fp_control_status); - mips64_fill_fpregset (fpregsetp, (mips_regnum (current_gdbarch) - ->fp_implementation_revision)); + mips64_fill_fpregset (regcache, fpregsetp, + gdbarch_fp0_regnum (gdbarch) + regi); + mips64_fill_fpregset (regcache, fpregsetp, + mips_regnum (gdbarch)->fp_control_status); + mips64_fill_fpregset (regcache, fpregsetp, + (mips_regnum (gdbarch) + ->fp_implementation_revision)); } } +static void +mips64_fill_fpregset_wrapper (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *gregs, size_t len) +{ + gdb_assert (len == sizeof (mips64_elf_fpregset_t)); -/* Use a local version of this function to get the correct types for - regsets, until multi-arch core support is ready. */ + mips64_fill_fpregset (regcache, (mips64_elf_fpregset_t *)gregs, regnum); +} -static void -fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, - int which, CORE_ADDR reg_addr) +const struct regset * +mips_linux_regset_from_core_section (struct gdbarch *gdbarch, + const char *sect_name, size_t sect_size) { + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); mips_elf_gregset_t gregset; mips_elf_fpregset_t fpregset; mips64_elf_gregset_t gregset64; mips64_elf_fpregset_t fpregset64; - if (which == 0) + if (strcmp (sect_name, ".reg") == 0) { - if (core_reg_size == sizeof (gregset)) + if (sect_size == sizeof (gregset)) { - memcpy ((char *) &gregset, core_reg_sect, sizeof (gregset)); - mips_supply_gregset (&gregset); + if (tdep->gregset == NULL) + tdep->gregset = regset_alloc (gdbarch, + mips_supply_gregset_wrapper, + mips_fill_gregset_wrapper); + return tdep->gregset; } - else if (core_reg_size == sizeof (gregset64)) + else if (sect_size == sizeof (gregset64)) { - memcpy ((char *) &gregset64, core_reg_sect, sizeof (gregset64)); - mips64_supply_gregset (&gregset64); + if (tdep->gregset64 == NULL) + tdep->gregset64 = regset_alloc (gdbarch, + mips64_supply_gregset_wrapper, + mips64_fill_gregset_wrapper); + return tdep->gregset64; } else { warning (_("wrong size gregset struct in core file")); } } - else if (which == 2) + else if (strcmp (sect_name, ".reg2") == 0) { - if (core_reg_size == sizeof (fpregset)) + if (sect_size == sizeof (fpregset)) { - memcpy ((char *) &fpregset, core_reg_sect, sizeof (fpregset)); - mips_supply_fpregset (&fpregset); + if (tdep->fpregset == NULL) + tdep->fpregset = regset_alloc (gdbarch, + mips_supply_fpregset_wrapper, + mips_fill_fpregset_wrapper); + return tdep->fpregset; } - else if (core_reg_size == sizeof (fpregset64)) + else if (sect_size == sizeof (fpregset64)) { - memcpy ((char *) &fpregset64, core_reg_sect, - sizeof (fpregset64)); - mips64_supply_fpregset (&fpregset64); + if (tdep->fpregset64 == NULL) + tdep->fpregset64 = regset_alloc (gdbarch, + mips64_supply_fpregset_wrapper, + mips64_fill_fpregset_wrapper); + return tdep->fpregset64; } else { warning (_("wrong size fpregset struct in core file")); } } -} -/* Register that we are able to handle ELF file formats using standard - procfs "regset" structures. */ + return NULL; +} -static struct core_fns regset_core_fns = +static const struct target_desc * +mips_linux_core_read_description (struct gdbarch *gdbarch, + struct target_ops *target, + bfd *abfd) { - bfd_target_elf_flavour, /* core_flavour */ - default_check_format, /* check_format */ - default_core_sniffer, /* core_sniffer */ - fetch_core_registers, /* core_read_registers */ - NULL /* next */ -}; + asection *section = bfd_get_section_by_name (abfd, ".reg"); + if (! section) + return NULL; + + switch (bfd_section_size (abfd, section)) + { + case sizeof (mips_elf_gregset_t): + return mips_tdesc_gp32; + + case sizeof (mips64_elf_gregset_t): + return mips_tdesc_gp64; + + default: + return NULL; + } +} /* Check the code at PC for a dynamic linker lazy resolution stub. @@ -530,7 +691,8 @@ mips_linux_in_dynsym_stub (CORE_ADDR pc, char *name) { unsigned char buf[28], *p; ULONGEST insn, insn1; - int n64 = (mips_abi (current_gdbarch) == MIPS_ABI_N64); + int n64 = (mips_abi (target_gdbarch) == MIPS_ABI_N64); + enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch); read_memory (pc - 12, buf, 28); @@ -548,7 +710,7 @@ mips_linux_in_dynsym_stub (CORE_ADDR pc, char *name) p = buf + 12; while (p >= buf) { - insn = extract_unsigned_integer (p, 4); + insn = extract_unsigned_integer (p, 4, byte_order); if (insn == insn1) break; p -= 4; @@ -556,7 +718,7 @@ mips_linux_in_dynsym_stub (CORE_ADDR pc, char *name) if (p < buf) return 0; - insn = extract_unsigned_integer (p + 4, 4); + insn = extract_unsigned_integer (p + 4, 4, byte_order); if (n64) { /* daddu t7,ra */ @@ -570,12 +732,12 @@ mips_linux_in_dynsym_stub (CORE_ADDR pc, char *name) return 0; } - insn = extract_unsigned_integer (p + 8, 4); + insn = extract_unsigned_integer (p + 8, 4, byte_order); /* jalr t9,ra */ if (insn != 0x0320f809) return 0; - insn = extract_unsigned_integer (p + 12, 4); + insn = extract_unsigned_integer (p + 12, 4, byte_order); if (n64) { /* daddiu t8,zero,0 */ @@ -593,14 +755,14 @@ mips_linux_in_dynsym_stub (CORE_ADDR pc, char *name) } /* Return non-zero iff PC belongs to the dynamic linker resolution - code or to a stub. */ + code, a PLT entry, or a lazy binding stub. */ -int +static int mips_linux_in_dynsym_resolve_code (CORE_ADDR pc) { /* Check whether PC is in the dynamic linker. This also checks - whether it is in the .plt section, which MIPS does not use. */ - if (in_solib_dynsym_resolve_code (pc)) + whether it is in the .plt section, used by non-PIC executables. */ + if (svr4_in_dynsym_resolve_code (pc)) return 1; /* Pattern match for the stub. It would be nice if there were a @@ -615,8 +777,8 @@ mips_linux_in_dynsym_resolve_code (CORE_ADDR pc) and glibc_skip_solib_resolver in glibc-tdep.c. The normal glibc implementation of this triggers at "fixup" from the same objfile as "_dl_runtime_resolve"; MIPS GNU/Linux can trigger at - "__dl_runtime_resolve" directly. An unresolved PLT entry will - point to _dl_runtime_resolve, which will first call + "__dl_runtime_resolve" directly. An unresolved lazy binding + stub will point to _dl_runtime_resolve, which will first call __dl_runtime_resolve, and then pass control to the resolved function. */ @@ -628,9 +790,9 @@ mips_linux_skip_resolver (struct gdbarch *gdbarch, CORE_ADDR pc) resolver = lookup_minimal_symbol ("__dl_runtime_resolve", NULL, NULL); if (resolver && SYMBOL_VALUE_ADDRESS (resolver) == pc) - return frame_pc_unwind (get_current_frame ()); + return frame_unwind_caller_pc (get_current_frame ()); - return 0; + return glibc_skip_solib_resolver (gdbarch, pc); } /* Signal trampoline support. There are four supported layouts for a @@ -639,12 +801,12 @@ mips_linux_skip_resolver (struct gdbarch *gdbarch, CORE_ADDR pc) efficient way, but simplest. First, declare all the unwinders. */ static void mips_linux_o32_sigframe_init (const struct tramp_frame *self, - struct frame_info *next_frame, + struct frame_info *this_frame, struct trad_frame_cache *this_cache, CORE_ADDR func); static void mips_linux_n32n64_sigframe_init (const struct tramp_frame *self, - struct frame_info *next_frame, + struct frame_info *this_frame, struct trad_frame_cache *this_cache, CORE_ADDR func); @@ -712,7 +874,7 @@ static const struct tramp_frame mips_linux_n64_rt_sigframe = { struct sigframe { u32 sf_ass[4]; [argument save space for o32] - u32 sf_code[2]; [signal trampoline] + u32 sf_code[2]; [signal trampoline or fill] struct sigcontext sf_sc; sigset_t sf_mask; }; @@ -742,7 +904,7 @@ static const struct tramp_frame mips_linux_n64_rt_sigframe = { struct rt_sigframe { u32 rs_ass[4]; [argument save space for o32] - u32 rs_code[2] [signal trampoline] + u32 rs_code[2] [signal trampoline or fill] struct siginfo rs_info; struct ucontext rs_uc; }; @@ -757,7 +919,6 @@ static const struct tramp_frame mips_linux_n64_rt_sigframe = { }; */ /* *INDENT-ON* */ -#define SIGFRAME_CODE_OFFSET (4 * 4) #define SIGFRAME_SIGCONTEXT_OFFSET (6 * 4) #define RTSIGFRAME_SIGINFO_SIZE 128 @@ -780,38 +941,42 @@ static const struct tramp_frame mips_linux_n64_rt_sigframe = { static void mips_linux_o32_sigframe_init (const struct tramp_frame *self, - struct frame_info *next_frame, + struct frame_info *this_frame, struct trad_frame_cache *this_cache, CORE_ADDR func) { + struct gdbarch *gdbarch = get_frame_arch (this_frame); int ireg, reg_position; - CORE_ADDR sigcontext_base = func - SIGFRAME_CODE_OFFSET; - const struct mips_regnum *regs = mips_regnum (current_gdbarch); + CORE_ADDR frame_sp = get_frame_sp (this_frame); + CORE_ADDR sigcontext_base; + const struct mips_regnum *regs = mips_regnum (gdbarch); CORE_ADDR regs_base; if (self == &mips_linux_o32_sigframe) - sigcontext_base += SIGFRAME_SIGCONTEXT_OFFSET; + sigcontext_base = frame_sp + SIGFRAME_SIGCONTEXT_OFFSET; else - sigcontext_base += RTSIGFRAME_SIGCONTEXT_OFFSET; + sigcontext_base = frame_sp + RTSIGFRAME_SIGCONTEXT_OFFSET; /* I'm not proud of this hack. Eventually we will have the infrastructure to indicate the size of saved registers on a per-frame basis, but right now we don't; the kernel saves eight bytes but we only want four. Use regs_base to access any 64-bit fields. */ - if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG) regs_base = sigcontext_base + 4; else regs_base = sigcontext_base; -#if 0 - trad_frame_set_reg_addr (this_cache, ORIG_ZERO_REGNUM + NUM_REGS, - regs_base + SIGCONTEXT_REGS); -#endif + if (mips_linux_restart_reg_p (gdbarch)) + trad_frame_set_reg_addr (this_cache, + (MIPS_RESTART_REGNUM + + gdbarch_num_regs (gdbarch)), + regs_base + SIGCONTEXT_REGS); for (ireg = 1; ireg < 32; ireg++) trad_frame_set_reg_addr (this_cache, - ireg + MIPS_ZERO_REGNUM + NUM_REGS, + ireg + MIPS_ZERO_REGNUM + + gdbarch_num_regs (gdbarch), regs_base + SIGCONTEXT_REGS + ireg * SIGCONTEXT_REG_SIZE); @@ -824,34 +989,42 @@ mips_linux_o32_sigframe_init (const struct tramp_frame *self, layout, since we can't tell, and it's much more common. Which bits are the "high" bits depends on endianness. */ for (ireg = 0; ireg < 32; ireg++) - if ((TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) != (ireg & 1)) - trad_frame_set_reg_addr (this_cache, ireg + regs->fp0 + NUM_REGS, + if ((gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG) != (ireg & 1)) + trad_frame_set_reg_addr (this_cache, + ireg + regs->fp0 + + gdbarch_num_regs (gdbarch), sigcontext_base + SIGCONTEXT_FPREGS + 4 + (ireg & ~1) * SIGCONTEXT_REG_SIZE); else - trad_frame_set_reg_addr (this_cache, ireg + regs->fp0 + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + ireg + regs->fp0 + + gdbarch_num_regs (gdbarch), sigcontext_base + SIGCONTEXT_FPREGS + (ireg & ~1) * SIGCONTEXT_REG_SIZE); - trad_frame_set_reg_addr (this_cache, regs->pc + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->pc + gdbarch_num_regs (gdbarch), regs_base + SIGCONTEXT_PC); trad_frame_set_reg_addr (this_cache, - regs->fp_control_status + NUM_REGS, + regs->fp_control_status + + gdbarch_num_regs (gdbarch), sigcontext_base + SIGCONTEXT_FPCSR); - trad_frame_set_reg_addr (this_cache, regs->hi + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->hi + gdbarch_num_regs (gdbarch), regs_base + SIGCONTEXT_HI); - trad_frame_set_reg_addr (this_cache, regs->lo + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->lo + gdbarch_num_regs (gdbarch), regs_base + SIGCONTEXT_LO); - trad_frame_set_reg_addr (this_cache, regs->cause + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->cause + gdbarch_num_regs (gdbarch), sigcontext_base + SIGCONTEXT_CAUSE); - trad_frame_set_reg_addr (this_cache, regs->badvaddr + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->badvaddr + gdbarch_num_regs (gdbarch), sigcontext_base + SIGCONTEXT_BADVADDR); /* Choice of the bottom of the sigframe is somewhat arbitrary. */ - trad_frame_set_id (this_cache, - frame_id_build (func - SIGFRAME_CODE_OFFSET, - func)); + trad_frame_set_id (this_cache, frame_id_build (frame_sp, func)); } /* *INDENT-OFF* */ @@ -859,7 +1032,7 @@ mips_linux_o32_sigframe_init (const struct tramp_frame *self, struct rt_sigframe_n32 { u32 rs_ass[4]; [ argument save space for o32 ] - u32 rs_code[2]; [ signal trampoline ] + u32 rs_code[2]; [ signal trampoline or fill ] struct siginfo rs_info; struct ucontextn32 rs_uc; }; @@ -872,7 +1045,7 @@ mips_linux_o32_sigframe_init (const struct tramp_frame *self, sigset_t uc_sigmask; [ mask last for extensibility ] }; - struct rt_sigframe_n32 { + struct rt_sigframe { u32 rs_ass[4]; [ argument save space for o32 ] u32 rs_code[2]; [ signal trampoline ] struct siginfo rs_info; @@ -893,15 +1066,23 @@ mips_linux_o32_sigframe_init (const struct tramp_frame *self, unsigned long long sc_regs[32]; unsigned long long sc_fpregs[32]; unsigned long long sc_mdhi; + unsigned long long sc_hi1; + unsigned long long sc_hi2; + unsigned long long sc_hi3; unsigned long long sc_mdlo; + unsigned long long sc_lo1; + unsigned long long sc_lo2; + unsigned long long sc_lo3; unsigned long long sc_pc; - unsigned int sc_status; unsigned int sc_fpc_csr; - unsigned int sc_fpc_eir; unsigned int sc_used_math; - unsigned int sc_cause; - unsigned int sc_badvaddr; - }; */ + unsigned int sc_dsp; + unsigned int sc_reserved; + }; + + That is the post-2.6.12 definition of the 64-bit sigcontext; before + then, there were no hi1-hi3 or lo1-lo3. Cause and badvaddr were + included too. */ /* *INDENT-ON* */ #define N32_STACK_T_SIZE STACK_T_SIZE @@ -918,108 +1099,112 @@ mips_linux_o32_sigframe_init (const struct tramp_frame *self, #define N64_SIGCONTEXT_REGS (0 * 8) #define N64_SIGCONTEXT_FPREGS (32 * 8) #define N64_SIGCONTEXT_HI (64 * 8) -#define N64_SIGCONTEXT_LO (65 * 8) -#define N64_SIGCONTEXT_PC (66 * 8) -#define N64_SIGCONTEXT_FPCSR (67 * 8 + 1 * 4) -#define N64_SIGCONTEXT_FIR (67 * 8 + 2 * 4) -#define N64_SIGCONTEXT_CAUSE (67 * 8 + 4 * 4) -#define N64_SIGCONTEXT_BADVADDR (67 * 8 + 5 * 4) +#define N64_SIGCONTEXT_LO (68 * 8) +#define N64_SIGCONTEXT_PC (72 * 8) +#define N64_SIGCONTEXT_FPCSR (73 * 8) #define N64_SIGCONTEXT_REG_SIZE 8 static void mips_linux_n32n64_sigframe_init (const struct tramp_frame *self, - struct frame_info *next_frame, + struct frame_info *this_frame, struct trad_frame_cache *this_cache, CORE_ADDR func) { + struct gdbarch *gdbarch = get_frame_arch (this_frame); int ireg, reg_position; - CORE_ADDR sigcontext_base = func - SIGFRAME_CODE_OFFSET; - const struct mips_regnum *regs = mips_regnum (current_gdbarch); + CORE_ADDR frame_sp = get_frame_sp (this_frame); + CORE_ADDR sigcontext_base; + const struct mips_regnum *regs = mips_regnum (gdbarch); if (self == &mips_linux_n32_rt_sigframe) - sigcontext_base += N32_SIGFRAME_SIGCONTEXT_OFFSET; + sigcontext_base = frame_sp + N32_SIGFRAME_SIGCONTEXT_OFFSET; else - sigcontext_base += N64_SIGFRAME_SIGCONTEXT_OFFSET; + sigcontext_base = frame_sp + N64_SIGFRAME_SIGCONTEXT_OFFSET; -#if 0 - trad_frame_set_reg_addr (this_cache, ORIG_ZERO_REGNUM + NUM_REGS, - sigcontext_base + N64_SIGCONTEXT_REGS); -#endif + if (mips_linux_restart_reg_p (gdbarch)) + trad_frame_set_reg_addr (this_cache, + (MIPS_RESTART_REGNUM + + gdbarch_num_regs (gdbarch)), + sigcontext_base + N64_SIGCONTEXT_REGS); for (ireg = 1; ireg < 32; ireg++) trad_frame_set_reg_addr (this_cache, - ireg + MIPS_ZERO_REGNUM + NUM_REGS, + ireg + MIPS_ZERO_REGNUM + + gdbarch_num_regs (gdbarch), sigcontext_base + N64_SIGCONTEXT_REGS + ireg * N64_SIGCONTEXT_REG_SIZE); for (ireg = 0; ireg < 32; ireg++) - trad_frame_set_reg_addr (this_cache, ireg + regs->fp0 + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + ireg + regs->fp0 + + gdbarch_num_regs (gdbarch), sigcontext_base + N64_SIGCONTEXT_FPREGS + ireg * N64_SIGCONTEXT_REG_SIZE); - trad_frame_set_reg_addr (this_cache, regs->pc + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->pc + gdbarch_num_regs (gdbarch), sigcontext_base + N64_SIGCONTEXT_PC); trad_frame_set_reg_addr (this_cache, - regs->fp_control_status + NUM_REGS, + regs->fp_control_status + + gdbarch_num_regs (gdbarch), sigcontext_base + N64_SIGCONTEXT_FPCSR); - trad_frame_set_reg_addr (this_cache, regs->hi + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->hi + gdbarch_num_regs (gdbarch), sigcontext_base + N64_SIGCONTEXT_HI); - trad_frame_set_reg_addr (this_cache, regs->lo + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->lo + gdbarch_num_regs (gdbarch), sigcontext_base + N64_SIGCONTEXT_LO); - trad_frame_set_reg_addr (this_cache, regs->cause + NUM_REGS, - sigcontext_base + N64_SIGCONTEXT_CAUSE); - trad_frame_set_reg_addr (this_cache, regs->badvaddr + NUM_REGS, - sigcontext_base + N64_SIGCONTEXT_BADVADDR); /* Choice of the bottom of the sigframe is somewhat arbitrary. */ - trad_frame_set_id (this_cache, - frame_id_build (func - SIGFRAME_CODE_OFFSET, - func)); + trad_frame_set_id (this_cache, frame_id_build (frame_sp, func)); } -/* Wrapper functions. These are only used by libthread_db. */ - -void -supply_gregset (mips_elf_gregset_t *gregsetp) +static void +mips_linux_write_pc (struct regcache *regcache, CORE_ADDR pc) { - if (mips_isa_regsize (current_gdbarch) == 4) - mips_supply_gregset (gregsetp); - else - mips64_supply_gregset ((void *) gregsetp); -} + struct gdbarch *gdbarch = get_regcache_arch (regcache); + regcache_cooked_write_unsigned (regcache, gdbarch_pc_regnum (gdbarch), pc); -void -fill_gregset (mips_elf_gregset_t *gregsetp, int regno) -{ - if (mips_isa_regsize (current_gdbarch) == 4) - mips_fill_gregset (gregsetp, regno); - else - mips64_fill_gregset ((void *) gregsetp, regno); + /* Clear the syscall restart flag. */ + if (mips_linux_restart_reg_p (gdbarch)) + regcache_cooked_write_unsigned (regcache, MIPS_RESTART_REGNUM, 0); } -/* Likewise, unpack an elf_fpregset_t. */ +/* Return 1 if MIPS_RESTART_REGNUM is usable. */ -void -supply_fpregset (mips_elf_fpregset_t *fpregsetp) +int +mips_linux_restart_reg_p (struct gdbarch *gdbarch) { - if (mips_isa_regsize (current_gdbarch) == 4) - mips_supply_fpregset (fpregsetp); - else - mips64_supply_fpregset ((void *) fpregsetp); + /* If we do not have a target description with registers, then + MIPS_RESTART_REGNUM will not be included in the register set. */ + if (!tdesc_has_registers (gdbarch_target_desc (gdbarch))) + return 0; + + /* If we do, then MIPS_RESTART_REGNUM is safe to check; it will + either be GPR-sized or missing. */ + return register_size (gdbarch, MIPS_RESTART_REGNUM) > 0; } -/* Likewise, pack one or all floating point registers into an - elf_fpregset_t. */ +/* When FRAME is at a syscall instruction, return the PC of the next + instruction to be executed. */ -void -fill_fpregset (mips_elf_fpregset_t *fpregsetp, int regno) +static CORE_ADDR +mips_linux_syscall_next_pc (struct frame_info *frame) { - if (mips_isa_regsize (current_gdbarch) == 4) - mips_fill_fpregset (fpregsetp, regno); - else - mips64_fill_fpregset ((void *) fpregsetp, regno); + CORE_ADDR pc = get_frame_pc (frame); + ULONGEST v0 = get_frame_register_unsigned (frame, MIPS_V0_REGNUM); + + /* If we are about to make a sigreturn syscall, use the unwinder to + decode the signal frame. */ + if (v0 == MIPS_NR_sigreturn + || v0 == MIPS_NR_rt_sigreturn + || v0 == MIPS_NR_N64_rt_sigreturn + || v0 == MIPS_NR_N32_rt_sigreturn) + return frame_unwind_caller_pc (get_current_frame ()); + + return pc + 4; } /* Initialize one of the GNU/Linux OS ABIs. */ @@ -1030,6 +1215,9 @@ mips_linux_init_abi (struct gdbarch_info info, { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); enum mips_abi abi = mips_abi (gdbarch); + struct tdesc_arch_data *tdesc_data = (void *) info.tdep_info; + + linux_init_abi (info, gdbarch); switch (abi) { @@ -1068,11 +1256,9 @@ mips_linux_init_abi (struct gdbarch_info info, tramp_frame_prepend_unwinder (gdbarch, &mips_linux_n64_rt_sigframe); break; default: - internal_error (__FILE__, __LINE__, _("can't handle ABI")); break; } - set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target); set_gdbarch_skip_solib_resolver (gdbarch, mips_linux_skip_resolver); set_gdbarch_software_single_step (gdbarch, mips_software_single_step); @@ -1080,8 +1266,49 @@ mips_linux_init_abi (struct gdbarch_info info, /* Enable TLS support. */ set_gdbarch_fetch_tls_load_module_address (gdbarch, svr4_fetch_objfile_link_map); + + /* Initialize this lazily, to avoid an initialization order + dependency on solib-svr4.c's _initialize routine. */ + if (mips_svr4_so_ops.in_dynsym_resolve_code == NULL) + { + mips_svr4_so_ops = svr4_so_ops; + mips_svr4_so_ops.in_dynsym_resolve_code + = mips_linux_in_dynsym_resolve_code; + } + set_solib_ops (gdbarch, &mips_svr4_so_ops); + + set_gdbarch_write_pc (gdbarch, mips_linux_write_pc); + + set_gdbarch_core_read_description (gdbarch, + mips_linux_core_read_description); + + set_gdbarch_regset_from_core_section (gdbarch, + mips_linux_regset_from_core_section); + + tdep->syscall_next_pc = mips_linux_syscall_next_pc; + + if (tdesc_data) + { + const struct tdesc_feature *feature; + + /* If we have target-described registers, then we can safely + reserve a number for MIPS_RESTART_REGNUM (whether it is + described or not). */ + gdb_assert (gdbarch_num_regs (gdbarch) <= MIPS_RESTART_REGNUM); + set_gdbarch_num_regs (gdbarch, MIPS_RESTART_REGNUM + 1); + + /* If it's present, then assign it to the reserved number. */ + feature = tdesc_find_feature (info.target_desc, + "org.gnu.gdb.mips.linux"); + if (feature != NULL) + tdesc_numbered_register (feature, tdesc_data, MIPS_RESTART_REGNUM, + "restart"); + } } +/* Provide a prototype to silence -Wmissing-prototypes. */ +extern initialize_file_ftype _initialize_mips_linux_tdep; + void _initialize_mips_linux_tdep (void) { @@ -1095,6 +1322,4 @@ _initialize_mips_linux_tdep (void) GDB_OSABI_LINUX, mips_linux_init_abi); } - - deprecated_add_core_fns (®set_core_fns); }