gas: slightly relax .startof.()/.sizeof.() testcase

[deliverable/binutils-gdb.git] / gdb / sh-nbsd-nat.c

diff --git a/gdb/sh-nbsd-nat.c b/gdb/sh-nbsd-nat.c
index 469674b169bedd92403b05377e9384097decab5c..90c9689899d9157f5c07e384a0d181f15b46f4b8 100644 (file)
--- a/gdb/sh-nbsd-nat.c
+++ b/gdb/sh-nbsd-nat.c
@@ -1,12 +1,14 @@
-/* Native-dependent code for SuperH running NetBSD, for GDB.
-   Copyright 2002 Free Software Foundation, Inc.
+/* Native-dependent code for NetBSD/sh.
+
+   Copyright (C) 2002-2017 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,62 +17,86 @@
    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 <http://www.gnu.org/licenses/>.  */
+
+#include "defs.h"
+#include "inferior.h"
 
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 
-#include "defs.h"
-#include "inferior.h"
+#include "sh-tdep.h"
+#include "inf-ptrace.h"
+#include "regcache.h"
 
-#include "sh-nbsd-tdep.h"
 
-/* Determine if PT_GETREGS fetches this register. */
-#define GETREGS_SUPPLIES(regno) \
+/* Determine if PT_GETREGS fetches this register.  */
+#define GETREGS_SUPPLIES(gdbarch, regno) \
   (((regno) >= R0_REGNUM && (regno) <= (R0_REGNUM + 15)) \
-|| (regno) == PC_REGNUM || (regno) == PR_REGNUM \
+|| (regno) == gdbarch_pc_regnum (gdbarch) || (regno) == PR_REGNUM \
 || (regno) == MACH_REGNUM || (regno) == MACL_REGNUM \
 || (regno) == SR_REGNUM)
 
-void
-fetch_inferior_registers (int regno)
+/* Sizeof `struct reg' in <machine/reg.h>.  */
+#define SHNBSD_SIZEOF_GREGS    (21 * 4)
+
+static void
+shnbsd_fetch_inferior_registers (struct target_ops *ops,
+                                struct regcache *regcache, int regno)
 {
-  if (regno == -1 || GETREGS_SUPPLIES (regno))
+  if (regno == -1 || GETREGS_SUPPLIES (get_regcache_arch (regcache), regno))
     {
       struct reg inferior_registers;
 
-      if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-                 (PTRACE_ARG3_TYPE) &inferior_registers, 0) == -1)
-       perror_with_name ("Couldn't get registers");
+      if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
+                 (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1)
+       perror_with_name (_("Couldn't get registers"));
 
-      sh_nbsd_supply_register ((char *) &inferior_registers, regno);
+      sh_corefile_supply_regset (&sh_corefile_gregset, regcache, regno,
+                                (char *) &inferior_registers,
+                                SHNBSD_SIZEOF_GREGS);
 
       if (regno != -1)
        return;
     }
 }
 
-void
-store_inferior_registers (int regno)
+static void
+shnbsd_store_inferior_registers (struct target_ops *ops,
+                                struct regcache *regcache, int regno)
 {
-  if (regno == -1 || GETREGS_SUPPLIES (regno))
+  if (regno == -1 || GETREGS_SUPPLIES (get_regcache_arch (regcache), regno))
     {
       struct reg inferior_registers;
 
-      if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-                 (PTRACE_ARG3_TYPE) &inferior_registers, 0) == -1)
-       perror_with_name ("Couldn't get registers");
+      if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
+                 (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1)
+       perror_with_name (_("Couldn't get registers"));
 
-      sh_nbsd_fill_register ((char *) &inferior_registers, regno);
+      sh_corefile_collect_regset (&sh_corefile_gregset, regcache, regno,
+                                 (char *) &inferior_registers,
+                                 SHNBSD_SIZEOF_GREGS);
 
-      if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-                 (PTRACE_ARG3_TYPE) &inferior_registers, 0) == -1)
-       perror_with_name ("Couldn't set registers");
+      if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid),
+                 (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1)
+       perror_with_name (_("Couldn't set registers"));
 
       if (regno != -1)
        return;
     }
 }
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+void _initialize_shnbsd_nat (void);
+
+void
+_initialize_shnbsd_nat (void)
+{
+  struct target_ops *t;
+
+  t = inf_ptrace_target ();
+  t->to_fetch_registers = shnbsd_fetch_inferior_registers;
+  t->to_store_registers = shnbsd_store_inferior_registers;
+  add_target (t);
+}