* Makefile.in (mips_linux_tdep_h): New.

	(mpis-linux-nat.o, mips-linux-tdep.o): Update.
	* mips-linux-nat.c: Include "inferior.h", "mips-linux-tdep.h", and
	<sys/ptrace.h>.
	(have_ptrace_regsets, super_fetch_registers, super_store_registers)
	(mips64_linux_regsets_fetch_registers)
	(mips64_linux_regsets_store_registers, mips64_linux_fetch_registers)
	(mips64_linux_store_registers): New.
	(_initialize_mips_linux_nat): Override to_fetch_registers and
	to_store_registers.
	* mips-linux-tdep.h: New file.
	* mips-linux-tdep.c: Include "mips-linux-tdep.c".
	(ELF_NGREG, ELF_NFPREG, elf_greg_t, elf_gregset_t, elf_fpreg_t)
	(elf_fpregset_t, FPR_BASE, PC, CAUSE, BADVADDR, MMHI, MMLO)
	(FPC_CSR, FPC_EIR, EF_REG0, EF_REG31, EF_LO, EF_HI, EF_CP0_EPC)
	(EF_CP0_BADVADDR, EF_CP0_STATUS, EF_CP0_CAUSE, EF_SIZE)
	(MIPS64_ELF_NGREG, MIPS64_ELF_NFPREG, mips64_elf_greg_t)
	(mips64_elf_gregset_t, mips64_elf_fpreg_t, mips64_elf_fpregset_t)
	(MIPS64_FPR_BASE, MIPS64_PC, MIPS64_CAUSE, MIPS64_BADVADDR)
	(MIPS64_MMHI, MIPS64_MMLO, MIPS64_FPC_CSR, MIPS64_FPC_EIR)
	(MIPS64_EF_REG0, MIPS64_EF_REG31, MIPS64_EF_LO, MIPS64_EF_HI)
	(MIPS64_EF_CP0_EPC, MIPS64_EF_CP0_BADVADDR, MIPS64_EF_CP0_STATUS)
	(MIPS64_EF_CP0_CAUSE, MIPS64_EF_SIZE): Delete.
	(supply_32bit_reg): Use gdb_byte.
	(supply_64bit_reg): New.
	(mips_supply_gregset, mips_fill_gregset, mips_supply_fpregset)
	(mips_fill_fpregset, fetch_core_registers, supply_gregset)
	(fill_gregset, supply_fpregset): Update for renamed types.
	(mips64_supply_gregset): Use gdb_byte and supply_64bit_reg.
	(mips64_fill_gregset): Make global.  Handle 32-bit register
	sizes.
	(mips64_fill_fpregset): Make global.  Use gdb_byte.  Handle
	FP regsets properly.

1 files changed, 166 insertions, 1 deletions

diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
index 1f18771..985ff27 100644
--- a/gdb/mips-linux-nat.c
+++ b/gdb/mips-linux-nat.c
@@ -21,16 +21,30 @@
    Boston, MA 02110-1301, USA.  */
 
 #include "defs.h"
+#include "inferior.h"
 #include "mips-tdep.h"
 #include "target.h"
 #include "linux-nat.h"
+#include "mips-linux-tdep.h"
 
 #include "gdb_proc_service.h"
 
+#include <sys/ptrace.h>
+
 #ifndef PTRACE_GET_THREAD_AREA
 #define PTRACE_GET_THREAD_AREA 25
 #endif
 
+/* Assume that we have PTRACE_GETREGS et al. support.  If we do not,
+   we'll clear this and use PTRACE_PEEKUSER instead.  */
+static int have_ptrace_regsets = 1;
+
+/* Saved function pointers to fetch and store a single register using
+   PTRACE_PEEKUSER and PTRACE_POKEUSER.  */
+
+void (*super_fetch_registers) (int);
+void (*super_store_registers) (int);
+
 /* Pseudo registers can not be read.  ptrace does not provide a way to
    read (or set) MIPS_PS_REGNUM, and there's no point in reading or
    setting MIPS_ZERO_REGNUM.  We also can not set BADVADDR, CAUSE, or
@@ -89,10 +103,161 @@ ps_get_thread_area (const struct ps_prochandle *ph,
   return PS_OK;
 }
 
+/* Fetch REGNO (or all registers if REGNO == -1) from the target
+   using PTRACE_GETREGS et al.  */
+
+static void
+mips64_linux_regsets_fetch_registers (int regno)
+{
+  int is_fp;
+  int tid;
+
+  if (regno >= mips_regnum (current_gdbarch)->fp0
+      && regno <= mips_regnum (current_gdbarch)->fp0 + 32)
+    is_fp = 1;
+  else if (regno == mips_regnum (current_gdbarch)->fp_control_status)
+    is_fp = 1;
+  else if (regno == mips_regnum (current_gdbarch)->fp_implementation_revision)
+    is_fp = 1;
+  else
+    is_fp = 0;
+
+  tid = ptid_get_lwp (inferior_ptid);
+  if (tid == 0)
+    tid = ptid_get_pid (inferior_ptid);
+
+  if (regno == -1 || !is_fp)
+    {
+      mips64_elf_gregset_t regs;
+
+      if (ptrace (PTRACE_GETREGS, tid, 0L, (PTRACE_TYPE_ARG3) &regs) == -1)
+	{
+	  if (errno == EIO)
+	    {
+	      have_ptrace_regsets = 0;
+	      return;
+	    }
+	  perror_with_name (_("Couldn't get registers"));
+	}
+
+      mips64_supply_gregset (&regs);
+    }
+
+  if (regno == -1 || is_fp)
+    {
+      mips64_elf_fpregset_t fp_regs;
+
+      if (ptrace (PTRACE_GETFPREGS, tid, 0L,
+		  (PTRACE_TYPE_ARG3) &fp_regs) == -1)
+	{
+	  if (errno == EIO)
+	    {
+	      have_ptrace_regsets = 0;
+	      return;
+	    }
+	  perror_with_name (_("Couldn't get FP registers"));
+	}
+
+      mips64_supply_fpregset (&fp_regs);
+    }
+}
+
+/* Store REGNO (or all registers if REGNO == -1) to the target
+   using PTRACE_SETREGS et al.  */
+
+static void
+mips64_linux_regsets_store_registers (int regno)
+{
+  int is_fp;
+  int tid;
+
+  if (regno >= mips_regnum (current_gdbarch)->fp0
+      && regno <= mips_regnum (current_gdbarch)->fp0 + 32)
+    is_fp = 1;
+  else if (regno == mips_regnum (current_gdbarch)->fp_control_status)
+    is_fp = 1;
+  else if (regno == mips_regnum (current_gdbarch)->fp_implementation_revision)
+    is_fp = 1;
+  else
+    is_fp = 0;
+
+  tid = ptid_get_lwp (inferior_ptid);
+  if (tid == 0)
+    tid = ptid_get_pid (inferior_ptid);
+
+  if (regno == -1 || !is_fp)
+    {
+      mips64_elf_gregset_t regs;
+
+      if (ptrace (PTRACE_GETREGS, tid, 0L, (PTRACE_TYPE_ARG3) &regs) == -1)
+	perror_with_name (_("Couldn't get registers"));
+
+      mips64_fill_gregset (&regs, regno);
+
+      if (ptrace (PTRACE_SETREGS, tid, 0L, (PTRACE_TYPE_ARG3) &regs) == -1)
+	perror_with_name (_("Couldn't set registers"));
+    }
+
+  if (regno == -1 || is_fp)
+    {
+      mips64_elf_fpregset_t fp_regs;
+
+      if (ptrace (PTRACE_GETFPREGS, tid, 0L,
+		  (PTRACE_TYPE_ARG3) &fp_regs) == -1)
+	perror_with_name (_("Couldn't get FP registers"));
+
+      mips64_fill_fpregset (&fp_regs, regno);
+
+      if (ptrace (PTRACE_SETFPREGS, tid, 0L,
+		  (PTRACE_TYPE_ARG3) &fp_regs) == -1)
+	perror_with_name (_("Couldn't set FP registers"));
+    }
+}
+
+/* Fetch REGNO (or all registers if REGNO == -1) from the target
+   using any working method.  */
+
+static void
+mips64_linux_fetch_registers (int regnum)
+{
+  /* Unless we already know that PTRACE_GETREGS does not work, try it.  */
+  if (have_ptrace_regsets)
+    mips64_linux_regsets_fetch_registers (regnum);
+
+  /* If we know, or just found out, that PTRACE_GETREGS does not work, fall
+     back to PTRACE_PEEKUSER.  */
+  if (!have_ptrace_regsets)
+    super_fetch_registers (regnum);
+}
+
+/* Store REGNO (or all registers if REGNO == -1) to the target
+   using any working method.  */
+
+static void
+mips64_linux_store_registers (int regnum)
+{
+  /* Unless we already know that PTRACE_GETREGS does not work, try it.  */
+  if (have_ptrace_regsets)
+    mips64_linux_regsets_store_registers (regnum);
+
+  /* If we know, or just found out, that PTRACE_GETREGS does not work, fall
+     back to PTRACE_PEEKUSER.  */
+  if (!have_ptrace_regsets)
+    super_store_registers (regnum);
+}
+
 void _initialize_mips_linux_nat (void);
 
 void
 _initialize_mips_linux_nat (void)
 {
-  add_target (linux_target ());
+  struct target_ops *t = linux_target ();
+
+  super_fetch_registers = t->to_fetch_registers;
+  super_store_registers = t->to_store_registers;
+
+  t->to_fetch_registers = mips64_linux_fetch_registers;
+  t->to_store_registers = mips64_linux_store_registers;
+
+  add_target (t);
 }