 @@ -1,155 +1,155 @@
 /* Native-dependent code for AMD64 BSD's.
    Copyright (C) 2003-2017 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 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.  */
 #include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
 /* We include <signal.h> to make sure `struct fxsave64' is defined on
    NetBSD, since NetBSD's <machine/reg.h> needs it.  */
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 #include "amd64-tdep.h"
 #include "amd64-nat.h"
 #include "x86-bsd-nat.h"
 #include "inf-ptrace.h"
 /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
    for all registers (including the floating-point registers).  */
 static void
 amd64bsd_fetch_inferior_registers (struct target_ops *ops,
 				   struct regcache *regcache, int regnum)
+{
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   pid_t pid = get_ptrace_pid (regcache_get_ptid (regcache));
   if (regnum == -1 || amd64_native_gregset_supplies_p (gdbarch, regnum))
+    {
       struct reg regs;
-      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
 	perror_with_name (_("Couldn't get registers"));
       amd64_supply_native_gregset (regcache, &regs, -1);
       if (regnum != -1)
 	return;
+    }
   if (regnum == -1 || !amd64_native_gregset_supplies_p (gdbarch, regnum))
+    {
       struct fpreg fpregs;
 #ifdef PT_GETXSTATE_INFO
       void *xstateregs;
       if (x86bsd_xsave_len != 0)
+	{
 	  xstateregs = alloca (x86bsd_xsave_len);
-	  if (ptrace (PT_GETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs, 0)
+	  if (ptrace (PT_GETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs,  ptid_get_lwp (inferior_ptid))
 	      == -1)
 	    perror_with_name (_("Couldn't get extended state status"));
 	  amd64_supply_xsave (regcache, -1, xstateregs);
 	  return;
+	}
 #endif
-      if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+      if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs,  ptid_get_lwp (inferior_ptid)) == -1)
 	perror_with_name (_("Couldn't get floating point status"));
       amd64_supply_fxsave (regcache, -1, &fpregs);
+    }
+}
 /* Store register REGNUM back into the inferior.  If REGNUM is -1, do
    this for all registers (including the floating-point registers).  */
 static void
 amd64bsd_store_inferior_registers (struct target_ops *ops,
 				   struct regcache *regcache, int regnum)
+{
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   pid_t pid = get_ptrace_pid (regcache_get_ptid (regcache));
   if (regnum == -1 || amd64_native_gregset_supplies_p (gdbarch, regnum))
+    {
       struct reg regs;
-      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
         perror_with_name (_("Couldn't get registers"));
       amd64_collect_native_gregset (regcache, &regs, regnum);
-      if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+      if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
         perror_with_name (_("Couldn't write registers"));
       if (regnum != -1)
 	return;
+    }
   if (regnum == -1 || !amd64_native_gregset_supplies_p (gdbarch, regnum))
+    {
       struct fpreg fpregs;
 #ifdef PT_GETXSTATE_INFO
       void *xstateregs;
       if (x86bsd_xsave_len != 0)
+	{
 	  xstateregs = alloca (x86bsd_xsave_len);
-	  if (ptrace (PT_GETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs, 0)
+	  if (ptrace (PT_GETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs,  ptid_get_lwp (inferior_ptid))
 	      == -1)
 	    perror_with_name (_("Couldn't get extended state status"));
-	  amd64_collect_xsave (regcache, regnum, xstateregs, 0);
+	  amd64_collect_xsave (regcache, regnum, xstateregs,  ptid_get_lwp (inferior_ptid));
 	  if (ptrace (PT_SETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs,
 		      x86bsd_xsave_len) == -1)
 	    perror_with_name (_("Couldn't write extended state status"));
 	  return;
+	}
 #endif
-      if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+      if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs,  ptid_get_lwp (inferior_ptid)) == -1)
 	perror_with_name (_("Couldn't get floating point status"));
       amd64_collect_fxsave (regcache, regnum, &fpregs);
-      if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+      if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs,  ptid_get_lwp (inferior_ptid)) == -1)
 	perror_with_name (_("Couldn't write floating point status"));
+    }
+}
 /* Create a prototype *BSD/amd64 target.  The client can override it
    with local methods.  */
 struct target_ops *
 amd64bsd_target (void)
+{
   struct target_ops *t;
   t = x86bsd_target ();
   t->to_fetch_registers = amd64bsd_fetch_inferior_registers;
   t->to_store_registers = amd64bsd_store_inferior_registers;
   return t;
+}

 @@ -1,362 +1,362 @@
 /* Native-dependent code for modern i386 BSD's.
    Copyright (C) 2000-2017 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 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.  */
 #include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 #include <machine/frame.h>
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 #include "x86-bsd-nat.h"
 #include "i386-bsd-nat.h"
 #include "inf-ptrace.h"
 /* In older BSD versions we cannot get at some of the segment
    registers.  FreeBSD for example didn't support the %fs and %gs
    registers until the 3.0 release.  We have autoconf checks for their
    presence, and deal gracefully with their absence.  */
 /* Offset in `struct reg' where MEMBER is stored.  */
 #define REG_OFFSET(member) offsetof (struct reg, member)
 /* At i386bsd_reg_offset[REGNUM] you'll find the offset in `struct
    reg' where the GDB register REGNUM is stored.  Unsupported
    registers are marked with `-1'.  */
 static int i386bsd_r_reg_offset[] =
+{
   REG_OFFSET (r_eax),
   REG_OFFSET (r_ecx),
   REG_OFFSET (r_edx),
   REG_OFFSET (r_ebx),
   REG_OFFSET (r_esp),
   REG_OFFSET (r_ebp),
   REG_OFFSET (r_esi),
   REG_OFFSET (r_edi),
   REG_OFFSET (r_eip),
   REG_OFFSET (r_eflags),
   REG_OFFSET (r_cs),
   REG_OFFSET (r_ss),
   REG_OFFSET (r_ds),
   REG_OFFSET (r_es),
 #ifdef HAVE_STRUCT_REG_R_FS
   REG_OFFSET (r_fs),
 #else
   -1,
 #endif
 #ifdef HAVE_STRUCT_REG_R_GS
   REG_OFFSET (r_gs)
 #else
   -1
 #endif
 };
 /* Macro to determine if a register is fetched with PT_GETREGS.  */
 #define GETREGS_SUPPLIES(regnum) \
   ((0 <= (regnum) && (regnum) <= 15))
 #ifdef HAVE_PT_GETXMMREGS
 /* Set to 1 if the kernel supports PT_GETXMMREGS.  Initialized to -1
    so that we try PT_GETXMMREGS the first time around.  */
 static int have_ptrace_xmmregs = -1;
 #endif
 /* Supply the general-purpose registers in GREGS, to REGCACHE.  */
 static void
 i386bsd_supply_gregset (struct regcache *regcache, const void *gregs)
+{
   const char *regs = (const char *) gregs;
   int regnum;
   for (regnum = 0; regnum < ARRAY_SIZE (i386bsd_r_reg_offset); regnum++)
+    {
       int offset = i386bsd_r_reg_offset[regnum];
       if (offset != -1)
 	regcache_raw_supply (regcache, regnum, regs + offset);
+    }
+}
 /* Collect register REGNUM from REGCACHE and store its contents in
    GREGS.  If REGNUM is -1, collect and store all appropriate
    registers.  */
 static void
 i386bsd_collect_gregset (const struct regcache *regcache,
 			 void *gregs, int regnum)
+{
   char *regs = (char *) gregs;
   int i;
   for (i = 0; i < ARRAY_SIZE (i386bsd_r_reg_offset); i++)
+    {
       if (regnum == -1 || regnum == i)
+	{
 	  int offset = i386bsd_r_reg_offset[i];
 	  if (offset != -1)
 	    regcache_raw_collect (regcache, i, regs + offset);
+	}
+    }
+}
 /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
    for all registers (including the floating point registers).  */
 static void
 i386bsd_fetch_inferior_registers (struct target_ops *ops,
 				  struct regcache *regcache, int regnum)
+{
   pid_t pid = get_ptrace_pid (regcache_get_ptid (regcache));
   if (regnum == -1 || GETREGS_SUPPLIES (regnum))
+    {
       struct reg regs;
-      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
 	perror_with_name (_("Couldn't get registers"));
       i386bsd_supply_gregset (regcache, &regs);
       if (regnum != -1)
 	return;
+    }
   if (regnum == -1 || regnum >= I386_ST0_REGNUM)
+    {
       struct fpreg fpregs;
 #ifdef HAVE_PT_GETXMMREGS
       char xmmregs[512];
 #endif
 #ifdef PT_GETXSTATE_INFO
       if (x86bsd_xsave_len != 0)
+	{
 	  void *xstateregs;
 	  xstateregs = alloca (x86bsd_xsave_len);
 	  if (ptrace (PT_GETXSTATE, pid,
-		      (PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
+		      (PTRACE_TYPE_ARG3) xstateregs,  ptid_get_lwp (inferior_ptid)) == -1)
 	    perror_with_name (_("Couldn't get extended state status"));
 	  i387_supply_xsave (regcache, -1, xstateregs);
 	  return;
+	}
 #endif
 #ifdef HAVE_PT_GETXMMREGS
       if (have_ptrace_xmmregs != 0
-	  && ptrace(PT_GETXMMREGS, pid, (PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
+	  && ptrace(PT_GETXMMREGS, pid, (PTRACE_TYPE_ARG3) xmmregs,  ptid_get_lwp (inferior_ptid)) == 0)
+	{
 	  have_ptrace_xmmregs = 1;
 	  i387_supply_fxsave (regcache, -1, xmmregs);
+	}
       else
+	{
 	  have_ptrace_xmmregs = 0;
 #endif
-          if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+          if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs,  ptid_get_lwp (inferior_ptid)) == -1)
 	    perror_with_name (_("Couldn't get floating point status"));
 	  i387_supply_fsave (regcache, -1, &fpregs);
 #ifdef HAVE_PT_GETXMMREGS
+	}
 #endif
+    }
+}
 /* Store register REGNUM back into the inferior.  If REGNUM is -1, do
    this for all registers (including the floating point registers).  */
 static void
 i386bsd_store_inferior_registers (struct target_ops *ops,
 				  struct regcache *regcache, int regnum)
+{
   pid_t pid = get_ptrace_pid (regcache_get_ptid (regcache));
   if (regnum == -1 || GETREGS_SUPPLIES (regnum))
+    {
       struct reg regs;
-      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
         perror_with_name (_("Couldn't get registers"));
       i386bsd_collect_gregset (regcache, &regs, regnum);
-      if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+      if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
         perror_with_name (_("Couldn't write registers"));
       if (regnum != -1)
 	return;
+    }
   if (regnum == -1 || regnum >= I386_ST0_REGNUM)
+    {
       struct fpreg fpregs;
 #ifdef HAVE_PT_GETXMMREGS
       char xmmregs[512];
 #endif
 #ifdef PT_GETXSTATE_INFO
       if (x86bsd_xsave_len != 0)
+	{
 	  void *xstateregs;
 	  xstateregs = alloca (x86bsd_xsave_len);
 	  if (ptrace (PT_GETXSTATE, pid,
-		      (PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
+		      (PTRACE_TYPE_ARG3) xstateregs,  ptid_get_lwp (inferior_ptid)) == -1)
 	    perror_with_name (_("Couldn't get extended state status"));
-	  i387_collect_xsave (regcache, -1, xstateregs, 0);
+	  i387_collect_xsave (regcache, -1, xstateregs,  ptid_get_lwp (inferior_ptid));
 	  if (ptrace (PT_SETXSTATE, pid,
 		      (PTRACE_TYPE_ARG3) xstateregs, x86bsd_xsave_len) == -1)
 	    perror_with_name (_("Couldn't write extended state status"));
 	  return;
+	}
 #endif
 #ifdef HAVE_PT_GETXMMREGS
       if (have_ptrace_xmmregs != 0
-	  && ptrace(PT_GETXMMREGS, pid, (PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
+	  && ptrace(PT_GETXMMREGS, pid, (PTRACE_TYPE_ARG3) xmmregs,  ptid_get_lwp (inferior_ptid)) == 0)
+	{
 	  have_ptrace_xmmregs = 1;
 	  i387_collect_fxsave (regcache, regnum, xmmregs);
-	  if (ptrace (PT_SETXMMREGS, pid, (PTRACE_TYPE_ARG3) xmmregs, 0) == -1)
+	  if (ptrace (PT_SETXMMREGS, pid, (PTRACE_TYPE_ARG3) xmmregs,  ptid_get_lwp (inferior_ptid)) == -1)
             perror_with_name (_("Couldn't write XMM registers"));
+	}
       else
+	{
 	  have_ptrace_xmmregs = 0;
 #endif
-          if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+          if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs,  ptid_get_lwp (inferior_ptid)) == -1)
 	    perror_with_name (_("Couldn't get floating point status"));
           i387_collect_fsave (regcache, regnum, &fpregs);
-          if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+          if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs,  ptid_get_lwp (inferior_ptid)) == -1)
 	    perror_with_name (_("Couldn't write floating point status"));
 #ifdef HAVE_PT_GETXMMREGS
+        }
 #endif
+    }
+}
 /* Create a prototype *BSD/i386 target.  The client can override it
    with local methods.  */
 struct target_ops *
 i386bsd_target (void)
+{
   struct target_ops *t;
   t = x86bsd_target ();
   t->to_fetch_registers = i386bsd_fetch_inferior_registers;
   t->to_store_registers = i386bsd_store_inferior_registers;
   return t;
+}
 /* Provide a prototype to silence -Wmissing-prototypes.  */
 void _initialize_i386bsd_nat (void);
 void
 _initialize_i386bsd_nat (void)
+{
   int offset;
   /* To support the recognition of signal handlers, i386-bsd-tdep.c
      hardcodes some constants.  Inclusion of this file means that we
      are compiling a native debugger, which means that we can use the
      system header files and sysctl(3) to get at the relevant
      information.  */
 #if defined (__FreeBSD_version) && __FreeBSD_version >= 400011
 #define SC_REG_OFFSET i386fbsd4_sc_reg_offset
 #elif defined (__FreeBSD_version) && __FreeBSD_version >= 300005
 #define SC_REG_OFFSET i386fbsd_sc_reg_offset
 #elif defined (NetBSD) || defined (__NetBSD_Version__)
 #define SC_REG_OFFSET i386nbsd_sc_reg_offset
 #elif defined (OpenBSD)
 #define SC_REG_OFFSET i386obsd_sc_reg_offset
 #endif
 #ifdef SC_REG_OFFSET
   /* We only check the program counter, stack pointer and frame
      pointer since these members of `struct sigcontext' are essential
      for providing backtraces.  More checks could be added, but would
      involve adding configure checks for the appropriate structure
      members, since older BSD's don't provide all of them.  */
 #define SC_PC_OFFSET SC_REG_OFFSET[I386_EIP_REGNUM]
 #define SC_SP_OFFSET SC_REG_OFFSET[I386_ESP_REGNUM]
 #define SC_FP_OFFSET SC_REG_OFFSET[I386_EBP_REGNUM]
   /* Override the default value for the offset of the program counter
      in the sigcontext structure.  */
   offset = offsetof (struct sigcontext, sc_pc);
   if (SC_PC_OFFSET != offset)
+    {
       warning (_("\
 offsetof (struct sigcontext, sc_pc) yields %d instead of %d.\n\
 Please report this to <bug-gdb@gnu.org>."),
 	       offset, SC_PC_OFFSET);
+    }
   SC_PC_OFFSET = offset;
   /* Likewise for the stack pointer.  */
   offset = offsetof (struct sigcontext, sc_sp);
   if (SC_SP_OFFSET != offset)
+    {
       warning (_("\
 offsetof (struct sigcontext, sc_sp) yields %d instead of %d.\n\
 Please report this to <bug-gdb@gnu.org>."),
 	       offset, SC_SP_OFFSET);
+    }
   SC_SP_OFFSET = offset;
   /* And the frame pointer.  */
   offset = offsetof (struct sigcontext, sc_fp);
   if (SC_FP_OFFSET != offset)
+    {
       warning (_("\
 offsetof (struct sigcontext, sc_fp) yields %d instead of %d.\n\
 Please report this to <bug-gdb@gnu.org>."),
 	       offset, SC_FP_OFFSET);
+    }
   SC_FP_OFFSET = offset;
 #endif /* SC_REG_OFFSET */
+}

 @@ -1,111 +1,111 @@
 /* Native-dependent code for Motorola 88000 BSD's.
    Copyright (C) 2004-2017 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 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.  */
 #include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 #include "m88k-tdep.h"
 #include "inf-ptrace.h"
 /* Supply the general-purpose registers stored in GREGS to REGCACHE.  */
 static void
 m88kbsd_supply_gregset (struct regcache *regcache, const void *gregs)
+{
   const char *regs = gregs;
   int regnum;
   for (regnum = 0; regnum < M88K_NUM_REGS; regnum++)
     regcache_raw_supply (regcache, regnum, regs + regnum * 4);
+}
 /* Collect the general-purpose registers from REGCACHE and store them
    in GREGS.  */
 static void
 m88kbsd_collect_gregset (const struct regcache *regcache,
 			 void *gregs, int regnum)
+{
   char *regs = gregs;
   int i;
   for (i = 0; i < M88K_NUM_REGS; i++)
+    {
       if (regnum == -1 || regnum == i)
 	regcache_raw_collect (regcache, i, regs + i * 4);
+    }
+}
 /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
    for all registers.  */
 static void
 m88kbsd_fetch_inferior_registers (struct target_ops *ops,
 				  struct regcache *regcache, int regnum)
+{
   struct reg regs;
   if (ptrace (PT_GETREGS, ptid_get_pid (regcache_get_ptid (regcache)),
-	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
     perror_with_name (_("Couldn't get registers"));
   m88kbsd_supply_gregset (regcache, &regs);
+}
 /* Store register REGNUM back into the inferior.  If REGNUM is -1, do
    this for all registers.  */
 static void
 m88kbsd_store_inferior_registers (struct target_ops *ops,
 				  struct regcache *regcache, int regnum)
+{
   struct reg regs;
   if (ptrace (PT_GETREGS, ptid_get_pid (regcache_get_ptid (regcache)),
-	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
     perror_with_name (_("Couldn't get registers"));
   m88kbsd_collect_gregset (regcache, &regs, regnum);
   if (ptrace (PT_SETREGS, ptid_get_pid (regcache_get_ptid (regcache)),
-	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
     perror_with_name (_("Couldn't write registers"));
+}
 /* Provide a prototype to silence -Wmissing-prototypes.  */
 void _initialize_m88kbsd_nat (void);
 void
 _initialize_m88kbsd_nat (void)
+{
   struct target_ops *t;
   t = inf_ptrace_target ();
   t->to_fetch_registers = m88kbsd_fetch_inferior_registers;
   t->to_store_registers = m88kbsd_store_inferior_registers;
   add_target (t);
+}

 @@ -1,235 +1,235 @@
 /* Native-dependent code for Motorola 68000 BSD's.
    Copyright (C) 2004-2017 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 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.  */
 #include "defs.h"
 #include "gdbcore.h"
 #include "inferior.h"
 #include "regcache.h"
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 #include "m68k-tdep.h"
 #include "inf-ptrace.h"
 static int
 m68kbsd_gregset_supplies_p (int regnum)
+{
   return (regnum >= M68K_D0_REGNUM && regnum <= M68K_PC_REGNUM);
+}
 static int
 m68kbsd_fpregset_supplies_p (int regnum)
+{
   return (regnum >= M68K_FP0_REGNUM && regnum <= M68K_FPI_REGNUM);
+}
 /* Supply the general-purpose registers stored in GREGS to REGCACHE.  */
 static void
 m68kbsd_supply_gregset (struct regcache *regcache, const void *gregs)
+{
   const char *regs = (const char *)gregs;
   int regnum;
   for (regnum = M68K_D0_REGNUM; regnum <= M68K_PC_REGNUM; regnum++)
     regcache_raw_supply (regcache, regnum, regs + regnum * 4);
+}
 /* Supply the floating-point registers stored in FPREGS to REGCACHE.  */
 static void
 m68kbsd_supply_fpregset (struct regcache *regcache, const void *fpregs)
+{
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   const char *regs = (const char *)fpregs;
   int regnum;
   for (regnum = M68K_FP0_REGNUM; regnum <= M68K_FPI_REGNUM; regnum++)
     regcache_raw_supply (regcache, regnum,
 			 regs + m68kbsd_fpreg_offset (gdbarch, regnum));
+}
 /* Collect the general-purpose registers from REGCACHE and store them
    in GREGS.  */
 static void
 m68kbsd_collect_gregset (const struct regcache *regcache,
 			 void *gregs, int regnum)
+{
   char *regs = (char *)gregs;
   int i;
   for (i = M68K_D0_REGNUM; i <= M68K_PC_REGNUM; i++)
+    {
       if (regnum == -1 || regnum == i)
 	regcache_raw_collect (regcache, i, regs + i * 4);
+    }
+}
 /* Collect the floating-point registers from REGCACHE and store them
    in FPREGS.  */
 static void
 m68kbsd_collect_fpregset (struct regcache *regcache,
 			  void *fpregs, int regnum)
+{
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   char *regs = (char *)fpregs;
   int i;
   for (i = M68K_FP0_REGNUM; i <= M68K_FPI_REGNUM; i++)
+    {
       if (regnum == -1 || regnum == i)
 	regcache_raw_collect (regcache, i,
 			      regs + m68kbsd_fpreg_offset (gdbarch, i));
+    }
+}
 /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
    for all registers (including the floating-point registers).  */
 static void
 m68kbsd_fetch_inferior_registers (struct target_ops *ops,
 				  struct regcache *regcache, int regnum)
+{
   pid_t pid = ptid_get_pid (regcache_get_ptid (regcache));
   if (regnum == -1 || m68kbsd_gregset_supplies_p (regnum))
+    {
       struct reg regs;
-      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
 	perror_with_name (_("Couldn't get registers"));
       m68kbsd_supply_gregset (regcache, &regs);
+    }
   if (regnum == -1 || m68kbsd_fpregset_supplies_p (regnum))
+    {
       struct fpreg fpregs;
-      if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+      if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs,  ptid_get_lwp (inferior_ptid)) == -1)
 	perror_with_name (_("Couldn't get floating point status"));
       m68kbsd_supply_fpregset (regcache, &fpregs);
+    }
+}
 /* Store register REGNUM back into the inferior.  If REGNUM is -1, do
    this for all registers (including the floating-point registers).  */
 static void
 m68kbsd_store_inferior_registers (struct target_ops *ops,
 				  struct regcache *regcache, int regnum)
+{
   pid_t pid = ptid_get_pid (regcache_get_ptid (regcache));
   if (regnum == -1 || m68kbsd_gregset_supplies_p (regnum))
+    {
       struct reg regs;
-      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
         perror_with_name (_("Couldn't get registers"));
       m68kbsd_collect_gregset (regcache, &regs, regnum);
-      if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+      if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
         perror_with_name (_("Couldn't write registers"));
+    }
   if (regnum == -1 || m68kbsd_fpregset_supplies_p (regnum))
+    {
       struct fpreg fpregs;
-      if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+      if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs,  ptid_get_lwp (inferior_ptid)) == -1)
 	perror_with_name (_("Couldn't get floating point status"));
       m68kbsd_collect_fpregset (regcache, &fpregs, regnum);
-      if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+      if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs,  ptid_get_lwp (inferior_ptid)) == -1)
 	perror_with_name (_("Couldn't write floating point status"));
+    }
+}
 /* Support for debugging kernel virtual memory images.  */
 #include <machine/pcb.h>
 #include "bsd-kvm.h"
 /* OpenBSD doesn't have these.  */
 #ifndef PCB_REGS_FP
 #define PCB_REGS_FP 10
 #endif
 #ifndef PCB_REGS_SP
 #define PCB_REGS_SP 11
 #endif
 static int
 m68kbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
+{
   int regnum, tmp;
   int i = 0;
   /* The following is true for NetBSD 1.6.2:
      The pcb contains %d2...%d7, %a2...%a7 and %ps.  This accounts for
      all callee-saved registers.  From this information we reconstruct
      the register state as it would look when we just returned from
      cpu_switch().  */
   /* The stack pointer shouldn't be zero.  */
   if (pcb->pcb_regs[PCB_REGS_SP] == 0)
     return 0;
   for (regnum = M68K_D2_REGNUM; regnum <= M68K_D7_REGNUM; regnum++)
     regcache_raw_supply (regcache, regnum, &pcb->pcb_regs[i++]);
   for (regnum = M68K_A2_REGNUM; regnum <= M68K_SP_REGNUM; regnum++)
     regcache_raw_supply (regcache, regnum, &pcb->pcb_regs[i++]);
   tmp = pcb->pcb_ps & 0xffff;
   regcache_raw_supply (regcache, M68K_PS_REGNUM, &tmp);
   read_memory (pcb->pcb_regs[PCB_REGS_FP] + 4, (gdb_byte *) &tmp, sizeof tmp);
   regcache_raw_supply (regcache, M68K_PC_REGNUM, &tmp);
   return 1;
+}
 /* Provide a prototype to silence -Wmissing-prototypes.  */
 void _initialize_m68kbsd_nat (void);
 void
 _initialize_m68kbsd_nat (void)
+{
   struct target_ops *t;
   t = inf_ptrace_target ();
   t->to_fetch_registers = m68kbsd_fetch_inferior_registers;
   t->to_store_registers = m68kbsd_store_inferior_registers;
   add_target (t);
   /* Support debugging kernel virtual memory images.  */
   bsd_kvm_add_target (m68kbsd_supply_pcb);
+}

 @@ -1,148 +1,148 @@
 /* Native-dependent code for modern VAX BSD's.
    Copyright (C) 2004-2017 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 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.  */
 #ifndef _KERNTYPES
 #define _KERNTYPES
 #endif
 #include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 #include "vax-tdep.h"
 #include "inf-ptrace.h"
 /* Supply the general-purpose registers stored in GREGS to REGCACHE.  */
 static void
 vaxbsd_supply_gregset (struct regcache *regcache, const void *gregs)
+{
   const gdb_byte *regs = (const gdb_byte *)gregs;
   int regnum;
   for (regnum = 0; regnum < VAX_NUM_REGS; regnum++)
     regcache_raw_supply (regcache, regnum, regs + regnum * 4);
+}
 /* Collect the general-purpose registers from REGCACHE and store them
    in GREGS.  */
 static void
 vaxbsd_collect_gregset (const struct regcache *regcache,
 			void *gregs, int regnum)
+{
   gdb_byte *regs = (gdb_byte *)gregs;
   int i;
   for (i = 0; i <= VAX_NUM_REGS; i++)
+    {
       if (regnum == -1 || regnum == i)
 	regcache_raw_collect (regcache, i, regs + i * 4);
+    }
+}
 /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
    for all registers.  */
 static void
 vaxbsd_fetch_inferior_registers (struct target_ops *ops,
 				 struct regcache *regcache, int regnum)
+{
   struct reg regs;
   pid_t pid = ptid_get_pid (regcache_get_ptid (regcache));
-  if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+  if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
     perror_with_name (_("Couldn't get registers"));
   vaxbsd_supply_gregset (regcache, &regs);
+}
 /* Store register REGNUM back into the inferior.  If REGNUM is -1, do
    this for all registers.  */
 static void
 vaxbsd_store_inferior_registers (struct target_ops *ops,
 				 struct regcache *regcache, int regnum)
+{
   struct reg regs;
   pid_t pid = ptid_get_pid (regcache_get_ptid (regcache));
-  if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+  if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
     perror_with_name (_("Couldn't get registers"));
   vaxbsd_collect_gregset (regcache, &regs, regnum);
-  if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+  if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  ptid_get_lwp (inferior_ptid)) == -1)
     perror_with_name (_("Couldn't write registers"));
+}
 /* Support for debugging kernel virtual memory images.  */
 #include <machine/pcb.h>
 #include "bsd-kvm.h"
 static int
 vaxbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
+{
   int regnum;
   /* The following is true for OpenBSD 3.5:
      The pcb contains the register state at the context switch inside
      cpu_switch().  */
   /* The stack pointer shouldn't be zero.  */
   if (pcb->KSP == 0)
     return 0;
   for (regnum = VAX_R0_REGNUM; regnum < VAX_AP_REGNUM; regnum++)
     regcache_raw_supply (regcache, regnum, &pcb->R[regnum - VAX_R0_REGNUM]);
   regcache_raw_supply (regcache, VAX_AP_REGNUM, &pcb->AP);
   regcache_raw_supply (regcache, VAX_FP_REGNUM, &pcb->FP);
   regcache_raw_supply (regcache, VAX_SP_REGNUM, &pcb->KSP);
   regcache_raw_supply (regcache, VAX_PC_REGNUM, &pcb->PC);
   regcache_raw_supply (regcache, VAX_PS_REGNUM, &pcb->PSL);
   return 1;
+}
 /* Provide a prototype to silence -Wmissing-prototypes.  */
 void _initialize_vaxbsd_nat (void);
 void
 _initialize_vaxbsd_nat (void)
+{
   struct target_ops *t;
   t = inf_ptrace_target ();
   t->to_fetch_registers = vaxbsd_fetch_inferior_registers;
   t->to_store_registers = vaxbsd_store_inferior_registers;
   add_target (t);
   /* Support debugging kernel virtual memory images.  */
   bsd_kvm_add_target (vaxbsd_supply_pcb);
+}