regcache::cooked_write test

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

diff --git a/gdb/sh-nbsd-nat.c b/gdb/sh-nbsd-nat.c
index 90c9689899d9157f5c07e384a0d181f15b46f4b8..d923e19799055f99f058e512af6c2822c5680db1 100644 (file)
--- a/gdb/sh-nbsd-nat.c
+++ b/gdb/sh-nbsd-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for NetBSD/sh.
 
-   Copyright (C) 2002-2017 Free Software Foundation, Inc.
+   Copyright (C) 2002-2018 Free Software Foundation, Inc.
 
    Contributed by Wasabi Systems, Inc.
 
@@ -45,11 +45,13 @@ static void
 shnbsd_fetch_inferior_registers (struct target_ops *ops,
                                 struct regcache *regcache, int regno)
 {
-  if (regno == -1 || GETREGS_SUPPLIES (get_regcache_arch (regcache), regno))
+  pid_t pid = ptid_get_pid (regcache_get_ptid (regcache));
+
+  if (regno == -1 || GETREGS_SUPPLIES (regcache->arch (), regno))
     {
       struct reg inferior_registers;
 
-      if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
+      if (ptrace (PT_GETREGS, pid,
                  (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
 
@@ -66,11 +68,13 @@ static void
 shnbsd_store_inferior_registers (struct target_ops *ops,
                                 struct regcache *regcache, int regno)
 {
-  if (regno == -1 || GETREGS_SUPPLIES (get_regcache_arch (regcache), regno))
+  pid_t pid = ptid_get_pid (regcache_get_ptid (regcache));
+
+  if (regno == -1 || GETREGS_SUPPLIES (regcache->arch (), regno))
     {
       struct reg inferior_registers;
 
-      if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
+      if (ptrace (PT_GETREGS, pid,
                  (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
 
@@ -78,7 +82,7 @@ shnbsd_store_inferior_registers (struct target_ops *ops,
                                  (char *) &inferior_registers,
                                  SHNBSD_SIZEOF_GREGS);
 
-      if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid),
+      if (ptrace (PT_SETREGS, pid,
                  (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1)
        perror_with_name (_("Couldn't set registers"));
 
@@ -87,9 +91,6 @@ shnbsd_store_inferior_registers (struct target_ops *ops,
     }
 }
 
-/* Provide a prototype to silence -Wmissing-prototypes.  */
-void _initialize_shnbsd_nat (void);
-
 void
 _initialize_shnbsd_nat (void)
 {