X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Farmnbsd-nat.c;h=de3f94d24ac46c1d625b1b39e7a84a68bedfa5e3;hb=9f1b45b0da430a7a7abf9e54acbe6f2ef9d3a763;hp=5113cbb630c500401853f8a21f5a5bbecc72f617;hpb=7b6bb8daaceb9ecf3f42dea57ae82733d6a3b2f6;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/armnbsd-nat.c b/gdb/armnbsd-nat.c
index 5113cbb630..de3f94d24a 100644
--- a/gdb/armnbsd-nat.c
+++ b/gdb/armnbsd-nat.c
@@ -1,7 +1,6 @@
 /* Native-dependent code for BSD Unix running on ARM's, for GDB.
 
-   Copyright (C) 1988, 1989, 1991, 1992, 1994, 1996, 1999, 2002, 2004, 2007,
-   2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1988-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -24,7 +23,7 @@
 #include "regcache.h"
 #include "target.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
@@ -80,7 +79,7 @@ fetch_register (struct regcache *regcache, int regno)
   struct reg inferior_registers;
   int ret;
 
-  ret = ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+  ret = ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
 		(PTRACE_TYPE_ARG3) &inferior_registers, 0);
 
   if (ret < 0)
@@ -102,7 +101,7 @@ fetch_register (struct regcache *regcache, int regno)
       break;
 
     case ARM_PC_REGNUM:
-      /* This is ok: we're running native... */
+      /* This is ok: we're running native...  */
       inferior_registers.r_pc = gdbarch_addr_bits_remove
 				  (get_regcache_arch (regcache),
 				   inferior_registers.r_pc);
@@ -133,7 +132,7 @@ fetch_regs (struct regcache *regcache)
   int ret;
   int regno;
 
-  ret = ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+  ret = ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
 		(PTRACE_TYPE_ARG3) &inferior_registers, 0);
 
   if (ret < 0)
@@ -151,7 +150,7 @@ fetch_fp_register (struct regcache *regcache, int regno)
   struct fpreg inferior_fp_registers;
   int ret;
 
-  ret = ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
+  ret = ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
 		(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
 
   if (ret < 0)
@@ -181,7 +180,7 @@ fetch_fp_regs (struct regcache *regcache)
   int ret;
   int regno;
 
-  ret = ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
+  ret = ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
 		(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
 
   if (ret < 0)
@@ -219,7 +218,7 @@ store_register (const struct regcache *regcache, int regno)
   struct reg inferior_registers;
   int ret;
 
-  ret = ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+  ret = ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
 		(PTRACE_TYPE_ARG3) &inferior_registers, 0);
 
   if (ret < 0)
@@ -282,7 +281,7 @@ store_register (const struct regcache *regcache, int regno)
       break;
     }
 
-  ret = ptrace (PT_SETREGS, PIDGET (inferior_ptid),
+  ret = ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid),
 		(PTRACE_TYPE_ARG3) &inferior_registers, 0);
 
   if (ret < 0)
@@ -330,7 +329,7 @@ store_regs (const struct regcache *regcache)
       inferior_registers.r_pc = pc_val | psr_val;
     }
 
-  ret = ptrace (PT_SETREGS, PIDGET (inferior_ptid),
+  ret = ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid),
 		(PTRACE_TYPE_ARG3) &inferior_registers, 0);
 
   if (ret < 0)
@@ -343,7 +342,7 @@ store_fp_register (const struct regcache *regcache, int regno)
   struct fpreg inferior_fp_registers;
   int ret;
 
-  ret = ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
+  ret = ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
 		(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
 
   if (ret < 0)
@@ -365,7 +364,7 @@ store_fp_register (const struct regcache *regcache, int regno)
       break;
     }
 
-  ret = ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
+  ret = ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid),
 		(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
 
   if (ret < 0)
@@ -387,7 +386,7 @@ store_fp_regs (const struct regcache *regcache)
   regcache_raw_collect (regcache, ARM_FPS_REGNUM,
 			(char *) &inferior_fp_registers.fpr_fpsr);
 
-  ret = ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
+  ret = ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid),
 		(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
 
   if (ret < 0)