don't let bin2hex call strlen

[deliverable/binutils-gdb.git] / gdb / m68kbsd-nat.c

diff --git a/gdb/m68kbsd-nat.c b/gdb/m68kbsd-nat.c
index fccc042d495db7be76119abdd1fdd1445cf0b084..dbd0e15d0cbe6bf686f3b18b80d09ff31e1d80f6 100644 (file)
--- a/gdb/m68kbsd-nat.c
+++ b/gdb/m68kbsd-nat.c
@@ -1,12 +1,12 @@
 /* Native-dependent code for Motorola 68000 BSD's.
 
 /* Native-dependent code for Motorola 68000 BSD's.
 

-   Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2004-2014 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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "gdbcore.h"
 
 #include "defs.h"
 #include "gdbcore.h"


@@ -61,12 +59,13 @@ m68kbsd_supply_gregset (struct regcache *regcache, const void *gregs)
 static void
 m68kbsd_supply_fpregset (struct regcache *regcache, const void *fpregs)
 {
 static void
 m68kbsd_supply_fpregset (struct regcache *regcache, const void *fpregs)
 {

+  struct gdbarch *gdbarch = get_regcache_arch (regcache);

   const char *regs = fpregs;
   int regnum;
 
   for (regnum = M68K_FP0_REGNUM; regnum <= M68K_FPI_REGNUM; regnum++)
     regcache_raw_supply (regcache, regnum,
   const char *regs = fpregs;
   int regnum;
 
   for (regnum = M68K_FP0_REGNUM; regnum <= M68K_FPI_REGNUM; regnum++)
     regcache_raw_supply (regcache, regnum,

-                        regs + m68kbsd_fpreg_offset (regnum));
+                        regs + m68kbsd_fpreg_offset (gdbarch, regnum));

 }
 
 /* Collect the general-purpose registers from REGCACHE and store them
 }
 
 /* Collect the general-purpose registers from REGCACHE and store them


@@ -93,13 +92,15 @@ static void
 m68kbsd_collect_fpregset (struct regcache *regcache,
                          void *fpregs, int regnum)
 {
 m68kbsd_collect_fpregset (struct regcache *regcache,
                          void *fpregs, int regnum)
 {

+  struct gdbarch *gdbarch = get_regcache_arch (regcache);

   char *regs = fpregs;
   int i;
 
   for (i = M68K_FP0_REGNUM; i <= M68K_FPI_REGNUM; i++)
     {
       if (regnum == -1 || regnum == i)
   char *regs = 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 (i));
+       regcache_raw_collect (regcache, i,
+                             regs + m68kbsd_fpreg_offset (gdbarch, i));

     }
 }
 \f
     }
 }
 \f


@@ -108,13 +109,14 @@ m68kbsd_collect_fpregset (struct regcache *regcache,
    for all registers (including the floating-point registers).  */
 
 static void
    for all registers (including the floating-point registers).  */
 
 static void

-m68kbsd_fetch_inferior_registers (struct regcache *regcache, int regnum)
+m68kbsd_fetch_inferior_registers (struct target_ops *ops,
+                                 struct regcache *regcache, int regnum)

 {
   if (regnum == -1 || m68kbsd_gregset_supplies_p (regnum))
     {
       struct reg regs;
 
 {
   if (regnum == -1 || m68kbsd_gregset_supplies_p (regnum))
     {
       struct reg regs;
 

-      if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+      if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),

                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
 
                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
 


@@ -125,7 +127,7 @@ m68kbsd_fetch_inferior_registers (struct regcache *regcache, int regnum)
     {
       struct fpreg fpregs;
 
     {
       struct fpreg fpregs;
 

-      if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
+      if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),

                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't get floating point status"));
 
                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't get floating point status"));
 


@@ -137,19 +139,20 @@ m68kbsd_fetch_inferior_registers (struct regcache *regcache, int regnum)
    this for all registers (including the floating-point registers).  */
 
 static void
    this for all registers (including the floating-point registers).  */
 
 static void

-m68kbsd_store_inferior_registers (struct regcache *regcache, int regnum)
+m68kbsd_store_inferior_registers (struct target_ops *ops,
+                                 struct regcache *regcache, int regnum)

 {
   if (regnum == -1 || m68kbsd_gregset_supplies_p (regnum))
     {
       struct reg regs;
 
 {
   if (regnum == -1 || m68kbsd_gregset_supplies_p (regnum))
     {
       struct reg regs;
 

-      if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+      if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),

                   (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name (_("Couldn't get registers"));
 
       m68kbsd_collect_gregset (regcache, &regs, regnum);
 
                   (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name (_("Couldn't get registers"));
 
       m68kbsd_collect_gregset (regcache, &regs, regnum);
 

-      if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
+      if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid),

                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name (_("Couldn't write registers"));
     }
                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name (_("Couldn't write registers"));
     }


@@ -158,13 +161,13 @@ m68kbsd_store_inferior_registers (struct regcache *regcache, int regnum)
     {
       struct fpreg fpregs;
 
     {
       struct fpreg fpregs;
 

-      if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
+      if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),

                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't get floating point status"));
 
       m68kbsd_collect_fpregset (regcache, &fpregs, regnum);
 
                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't get floating point status"));
 
       m68kbsd_collect_fpregset (regcache, &fpregs, regnum);
 

-      if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
+      if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid),

                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't write floating point status"));
     }
                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't write floating point status"));
     }


@@ -173,7 +176,6 @@ m68kbsd_store_inferior_registers (struct regcache *regcache, int regnum)
 
 /* Support for debugging kernel virtual memory images.  */
 
 
 /* Support for debugging kernel virtual memory images.  */
 

-#include <sys/types.h>

 #include <machine/pcb.h>
 
 #include "bsd-kvm.h"
 #include <machine/pcb.h>
 
 #include "bsd-kvm.h"