diff mbox

[v2,3/3] Add native target for FreeBSD/mips.

Message ID 20161206210015.40422-4-jhb@FreeBSD.org
State New
Headers show

Commit Message

John Baldwin Dec. 6, 2016, 9 p.m. UTC
This supports the o32 and n64 ABIs.

gdb/ChangeLog:

	* Makefile.in (ALLDEPFILES): Add mips-fbsd-nat.c.
	* config/mips/fbsd.mh: New file.
	* configure.host: Add mips*-*-freebsd*.
	* mips-fbsd-nat.c: New file.
---
 gdb/ChangeLog           |   7 +++
 gdb/Makefile.in         |   1 +
 gdb/config/mips/fbsd.mh |   3 ++
 gdb/configure.host      |   1 +
 gdb/mips-fbsd-nat.c     | 141 ++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 153 insertions(+)
 create mode 100644 gdb/config/mips/fbsd.mh
 create mode 100644 gdb/mips-fbsd-nat.c

Comments

Luis Machado Dec. 8, 2016, 6:53 p.m. UTC | #1
On 12/06/2016 03:00 PM, John Baldwin wrote:
> This supports the o32 and n64 ABIs.
>
> gdb/ChangeLog:
>
> 	* Makefile.in (ALLDEPFILES): Add mips-fbsd-nat.c.
> 	* config/mips/fbsd.mh: New file.
> 	* configure.host: Add mips*-*-freebsd*.
> 	* mips-fbsd-nat.c: New file.
> ---
>  gdb/ChangeLog           |   7 +++
>  gdb/Makefile.in         |   1 +
>  gdb/config/mips/fbsd.mh |   3 ++
>  gdb/configure.host      |   1 +
>  gdb/mips-fbsd-nat.c     | 141 ++++++++++++++++++++++++++++++++++++++++++++++++
>  5 files changed, 153 insertions(+)
>  create mode 100644 gdb/config/mips/fbsd.mh
>  create mode 100644 gdb/mips-fbsd-nat.c
>
> diff --git a/gdb/ChangeLog b/gdb/ChangeLog
> index 890702e..fc43f81 100644
> --- a/gdb/ChangeLog
> +++ b/gdb/ChangeLog
> @@ -1,5 +1,12 @@
>  2016-12-06  John Baldwin  <jhb@FreeBSD.org>
>
> +	* Makefile.in (ALLDEPFILES): Add mips-fbsd-nat.c.
> +	* config/mips/fbsd.mh: New file.
> +	* configure.host: Add mips*-*-freebsd*.
> +	* mips-fbsd-nat.c: New file.
> +
> +2016-12-06  John Baldwin  <jhb@FreeBSD.org>
> +
>  	* Makefile.in (ALL_TARGET_OBS): Add mips-fbsd-tdep.o.
>  	(ALLDEPFILES): Add mips-fbsd-tdep.c.
>  	* configure.tgt: Add mips*-*-freebsd*.
> diff --git a/gdb/Makefile.in b/gdb/Makefile.in
> index e34fa4a..dee9d73 100644
> --- a/gdb/Makefile.in
> +++ b/gdb/Makefile.in
> @@ -2542,6 +2542,7 @@ ALLDEPFILES = \
>  	microblaze-linux-tdep.c \
>  	microblaze-tdep.c \
>  	mingw-hdep.c \
> +	mips-fbsd-nat.c \
>  	mips-fbsd-tdep.c \
>  	mips-linux-nat.c \
>  	mips-linux-tdep.c \
> diff --git a/gdb/config/mips/fbsd.mh b/gdb/config/mips/fbsd.mh
> new file mode 100644
> index 0000000..f433347
> --- /dev/null
> +++ b/gdb/config/mips/fbsd.mh
> @@ -0,0 +1,3 @@
> +# Host: FreeBSD/mips
> +NATDEPFILES= fork-child.o inf-ptrace.o fbsd-nat.o mips-fbsd-nat.o
> +HAVE_NATIVE_GCORE_HOST = 1

I suppose you tried the gcore command for native GDB on FreeBSD/MIPS and 
it worked fine?

> diff --git a/gdb/configure.host b/gdb/configure.host
> index ef265eb..c45f61d 100644
> --- a/gdb/configure.host
> +++ b/gdb/configure.host
> @@ -129,6 +129,7 @@ m88*-*-openbsd*)	gdb_host=obsd ;;
>  mips*-*-linux*)		gdb_host=linux ;;
>  mips*-*-netbsd* | mips*-*-knetbsd*-gnu)
>  			gdb_host=nbsd ;;
> +mips*-*-freebsd*)	gdb_host=fbsd ;;
>  mips64*-*-openbsd*)	gdb_host=obsd64 ;;
>
>  powerpc-*-aix* | rs6000-*-* | powerpc64-*-aix*)
> diff --git a/gdb/mips-fbsd-nat.c b/gdb/mips-fbsd-nat.c
> new file mode 100644
> index 0000000..ec1dcd8
> --- /dev/null
> +++ b/gdb/mips-fbsd-nat.c
> @@ -0,0 +1,141 @@
> +/* Native-dependent code for FreeBSD/mips.
> +
> +   Copyright (C) 2016 Free Software Foundation, Inc.
> +
> +   This software was developed by SRI International and the University
> +   of Cambridge Computer Laboratory under DARPA/AFRL contract
> +   FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research
> +   programme.
> +
> +   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 "fbsd-nat.h"
> +#include "mips-tdep.h"
> +#include "mips-fbsd-tdep.h"
> +#include "inf-ptrace.h"
> +
> +/* Determine if PT_GETREGS fetches this register.  */
> +
> +static bool
> +getregs_supplies (struct gdbarch *gdbarch, int regnum)
> +{
> +  return ((regnum) >= MIPS_ZERO_REGNUM
> +	  && (regnum) <= gdbarch_pc_regnum (gdbarch));
> +}
> +

Not sure we need the extra ()'s around regnum.

Otherwise i have no further comments on this one.

I'm guessing someone from binutils' side will want to validate 1/3.

Thanks,
Luis
John Baldwin Dec. 8, 2016, 8:03 p.m. UTC | #2
On Thursday, December 08, 2016 12:53:06 PM Luis Machado wrote:
> On 12/06/2016 03:00 PM, John Baldwin wrote:
> > This supports the o32 and n64 ABIs.
> >
> > gdb/ChangeLog:
> >
> > 	* Makefile.in (ALLDEPFILES): Add mips-fbsd-nat.c.
> > 	* config/mips/fbsd.mh: New file.
> > 	* configure.host: Add mips*-*-freebsd*.
> > 	* mips-fbsd-nat.c: New file.
> > ---
> >  gdb/ChangeLog           |   7 +++
> >  gdb/Makefile.in         |   1 +
> >  gdb/config/mips/fbsd.mh |   3 ++
> >  gdb/configure.host      |   1 +
> >  gdb/mips-fbsd-nat.c     | 141 ++++++++++++++++++++++++++++++++++++++++++++++++
> >  5 files changed, 153 insertions(+)
> >  create mode 100644 gdb/config/mips/fbsd.mh
> >  create mode 100644 gdb/mips-fbsd-nat.c
> >
> > diff --git a/gdb/ChangeLog b/gdb/ChangeLog
> > index 890702e..fc43f81 100644
> > --- a/gdb/ChangeLog
> > +++ b/gdb/ChangeLog
> > @@ -1,5 +1,12 @@
> >  2016-12-06  John Baldwin  <jhb@FreeBSD.org>
> >
> > +	* Makefile.in (ALLDEPFILES): Add mips-fbsd-nat.c.
> > +	* config/mips/fbsd.mh: New file.
> > +	* configure.host: Add mips*-*-freebsd*.
> > +	* mips-fbsd-nat.c: New file.
> > +
> > +2016-12-06  John Baldwin  <jhb@FreeBSD.org>
> > +
> >  	* Makefile.in (ALL_TARGET_OBS): Add mips-fbsd-tdep.o.
> >  	(ALLDEPFILES): Add mips-fbsd-tdep.c.
> >  	* configure.tgt: Add mips*-*-freebsd*.
> > diff --git a/gdb/Makefile.in b/gdb/Makefile.in
> > index e34fa4a..dee9d73 100644
> > --- a/gdb/Makefile.in
> > +++ b/gdb/Makefile.in
> > @@ -2542,6 +2542,7 @@ ALLDEPFILES = \
> >  	microblaze-linux-tdep.c \
> >  	microblaze-tdep.c \
> >  	mingw-hdep.c \
> > +	mips-fbsd-nat.c \
> >  	mips-fbsd-tdep.c \
> >  	mips-linux-nat.c \
> >  	mips-linux-tdep.c \
> > diff --git a/gdb/config/mips/fbsd.mh b/gdb/config/mips/fbsd.mh
> > new file mode 100644
> > index 0000000..f433347
> > --- /dev/null
> > +++ b/gdb/config/mips/fbsd.mh
> > @@ -0,0 +1,3 @@
> > +# Host: FreeBSD/mips
> > +NATDEPFILES= fork-child.o inf-ptrace.o fbsd-nat.o mips-fbsd-nat.o
> > +HAVE_NATIVE_GCORE_HOST = 1
> 
> I suppose you tried the gcore command for native GDB on FreeBSD/MIPS and 
> it worked fine?

It mostly does.  I can read the core fine using native GDB on MIPS, but
an x86 GDB doesn't parse the generated core correctly (though it does
parse a native core from the kernel correctly).  The issue here though
isn't really a MIPS-specific one.  Right now the FreeBSD target-dependent
code uses code from binutils to write out the prpsinfo and prstatus notes
and those write Linux-style "CORE" notes.  I have a todo to fix gcore in
gdb to write out "FreeBSD" process and thread status notes instead which
will fix this (along with a separate, but somewhat similar issue with
gdb's gcore on FreeBSD/powerpc).
 
> > +/* Determine if PT_GETREGS fetches this register.  */
> > +
> > +static bool
> > +getregs_supplies (struct gdbarch *gdbarch, int regnum)
> > +{
> > +  return ((regnum) >= MIPS_ZERO_REGNUM
> > +	  && (regnum) <= gdbarch_pc_regnum (gdbarch));
> > +}
> > +
> 
> Not sure we need the extra ()'s around regnum.

Oops, will fix.

> Otherwise i have no further comments on this one.
> 
> I'm guessing someone from binutils' side will want to validate 1/3.

Yes.
Luis Machado Dec. 8, 2016, 8:15 p.m. UTC | #3
On 12/08/2016 02:03 PM, John Baldwin wrote:
> On Thursday, December 08, 2016 12:53:06 PM Luis Machado wrote:
>> On 12/06/2016 03:00 PM, John Baldwin wrote:
>>> This supports the o32 and n64 ABIs.
>>>
>>> gdb/ChangeLog:
>>>
>>> 	* Makefile.in (ALLDEPFILES): Add mips-fbsd-nat.c.
>>> 	* config/mips/fbsd.mh: New file.
>>> 	* configure.host: Add mips*-*-freebsd*.
>>> 	* mips-fbsd-nat.c: New file.
>>> ---
>>>  gdb/ChangeLog           |   7 +++
>>>  gdb/Makefile.in         |   1 +
>>>  gdb/config/mips/fbsd.mh |   3 ++
>>>  gdb/configure.host      |   1 +
>>>  gdb/mips-fbsd-nat.c     | 141 ++++++++++++++++++++++++++++++++++++++++++++++++
>>>  5 files changed, 153 insertions(+)
>>>  create mode 100644 gdb/config/mips/fbsd.mh
>>>  create mode 100644 gdb/mips-fbsd-nat.c
>>>
>>> diff --git a/gdb/ChangeLog b/gdb/ChangeLog
>>> index 890702e..fc43f81 100644
>>> --- a/gdb/ChangeLog
>>> +++ b/gdb/ChangeLog
>>> @@ -1,5 +1,12 @@
>>>  2016-12-06  John Baldwin  <jhb@FreeBSD.org>
>>>
>>> +	* Makefile.in (ALLDEPFILES): Add mips-fbsd-nat.c.
>>> +	* config/mips/fbsd.mh: New file.
>>> +	* configure.host: Add mips*-*-freebsd*.
>>> +	* mips-fbsd-nat.c: New file.
>>> +
>>> +2016-12-06  John Baldwin  <jhb@FreeBSD.org>
>>> +
>>>  	* Makefile.in (ALL_TARGET_OBS): Add mips-fbsd-tdep.o.
>>>  	(ALLDEPFILES): Add mips-fbsd-tdep.c.
>>>  	* configure.tgt: Add mips*-*-freebsd*.
>>> diff --git a/gdb/Makefile.in b/gdb/Makefile.in
>>> index e34fa4a..dee9d73 100644
>>> --- a/gdb/Makefile.in
>>> +++ b/gdb/Makefile.in
>>> @@ -2542,6 +2542,7 @@ ALLDEPFILES = \
>>>  	microblaze-linux-tdep.c \
>>>  	microblaze-tdep.c \
>>>  	mingw-hdep.c \
>>> +	mips-fbsd-nat.c \
>>>  	mips-fbsd-tdep.c \
>>>  	mips-linux-nat.c \
>>>  	mips-linux-tdep.c \
>>> diff --git a/gdb/config/mips/fbsd.mh b/gdb/config/mips/fbsd.mh
>>> new file mode 100644
>>> index 0000000..f433347
>>> --- /dev/null
>>> +++ b/gdb/config/mips/fbsd.mh
>>> @@ -0,0 +1,3 @@
>>> +# Host: FreeBSD/mips
>>> +NATDEPFILES= fork-child.o inf-ptrace.o fbsd-nat.o mips-fbsd-nat.o
>>> +HAVE_NATIVE_GCORE_HOST = 1
>>
>> I suppose you tried the gcore command for native GDB on FreeBSD/MIPS and
>> it worked fine?
>
> It mostly does.  I can read the core fine using native GDB on MIPS, but
> an x86 GDB doesn't parse the generated core correctly (though it does
> parse a native core from the kernel correctly).  The issue here though
> isn't really a MIPS-specific one.  Right now the FreeBSD target-dependent
> code uses code from binutils to write out the prpsinfo and prstatus notes
> and those write Linux-style "CORE" notes.  I have a todo to fix gcore in
> gdb to write out "FreeBSD" process and thread status notes instead which
> will fix this (along with a separate, but somewhat similar issue with
> gdb's gcore on FreeBSD/powerpc).
>

Ok. I'm just making sure the feature is mostly usable before we enable 
it (gcore) here. It sounds like it is.
diff mbox

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 890702e..fc43f81 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@ 
 2016-12-06  John Baldwin  <jhb@FreeBSD.org>
 
+	* Makefile.in (ALLDEPFILES): Add mips-fbsd-nat.c.
+	* config/mips/fbsd.mh: New file.
+	* configure.host: Add mips*-*-freebsd*.
+	* mips-fbsd-nat.c: New file.
+
+2016-12-06  John Baldwin  <jhb@FreeBSD.org>
+
 	* Makefile.in (ALL_TARGET_OBS): Add mips-fbsd-tdep.o.
 	(ALLDEPFILES): Add mips-fbsd-tdep.c.
 	* configure.tgt: Add mips*-*-freebsd*.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index e34fa4a..dee9d73 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2542,6 +2542,7 @@  ALLDEPFILES = \
 	microblaze-linux-tdep.c \
 	microblaze-tdep.c \
 	mingw-hdep.c \
+	mips-fbsd-nat.c \
 	mips-fbsd-tdep.c \
 	mips-linux-nat.c \
 	mips-linux-tdep.c \
diff --git a/gdb/config/mips/fbsd.mh b/gdb/config/mips/fbsd.mh
new file mode 100644
index 0000000..f433347
--- /dev/null
+++ b/gdb/config/mips/fbsd.mh
@@ -0,0 +1,3 @@ 
+# Host: FreeBSD/mips
+NATDEPFILES= fork-child.o inf-ptrace.o fbsd-nat.o mips-fbsd-nat.o
+HAVE_NATIVE_GCORE_HOST = 1
diff --git a/gdb/configure.host b/gdb/configure.host
index ef265eb..c45f61d 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -129,6 +129,7 @@  m88*-*-openbsd*)	gdb_host=obsd ;;
 mips*-*-linux*)		gdb_host=linux ;;
 mips*-*-netbsd* | mips*-*-knetbsd*-gnu)
 			gdb_host=nbsd ;;
+mips*-*-freebsd*)	gdb_host=fbsd ;;
 mips64*-*-openbsd*)	gdb_host=obsd64 ;;
 
 powerpc-*-aix* | rs6000-*-* | powerpc64-*-aix*)
diff --git a/gdb/mips-fbsd-nat.c b/gdb/mips-fbsd-nat.c
new file mode 100644
index 0000000..ec1dcd8
--- /dev/null
+++ b/gdb/mips-fbsd-nat.c
@@ -0,0 +1,141 @@ 
+/* Native-dependent code for FreeBSD/mips.
+
+   Copyright (C) 2016 Free Software Foundation, Inc.
+
+   This software was developed by SRI International and the University
+   of Cambridge Computer Laboratory under DARPA/AFRL contract
+   FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research
+   programme.
+
+   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 "fbsd-nat.h"
+#include "mips-tdep.h"
+#include "mips-fbsd-tdep.h"
+#include "inf-ptrace.h"
+
+/* Determine if PT_GETREGS fetches this register.  */
+
+static bool
+getregs_supplies (struct gdbarch *gdbarch, int regnum)
+{
+  return ((regnum) >= MIPS_ZERO_REGNUM
+	  && (regnum) <= gdbarch_pc_regnum (gdbarch));
+}
+
+/* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
+   for all registers.  */
+
+static void
+mips_fbsd_fetch_inferior_registers (struct target_ops *ops,
+				    struct regcache *regcache, int regnum)
+{
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  if (regnum == -1 || getregs_supplies (gdbarch, regnum))
+    {
+      struct reg regs;
+
+      if (ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid),
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+	perror_with_name (_("Couldn't get registers"));
+
+      mips_fbsd_supply_gregs (regcache, regnum, &regs, sizeof (register_t));
+      if (regnum != -1)
+	return;
+    }
+
+  if (regnum == -1
+      || regnum >= gdbarch_fp0_regnum (get_regcache_arch (regcache)))
+    {
+      struct fpreg fpregs;
+
+      if (ptrace (PT_GETFPREGS, get_ptrace_pid (inferior_ptid),
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+	perror_with_name (_("Couldn't get floating point status"));
+
+      mips_fbsd_supply_fpregs (regcache, regnum, &fpregs,
+			       sizeof (f_register_t));
+    }
+}
+
+/* Store register REGNUM back into the inferior.  If REGNUM is -1, do
+   this for all registers.  */
+
+static void
+mips_fbsd_store_inferior_registers (struct target_ops *ops,
+				    struct regcache *regcache, int regnum)
+{
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  if (regnum == -1 || getregs_supplies (gdbarch, regnum))
+    {
+      struct reg regs;
+
+      if (ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid),
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+	perror_with_name (_("Couldn't get registers"));
+
+      mips_fbsd_collect_gregs (regcache, regnum, (char *) &regs,
+			       sizeof (register_t));
+
+      if (ptrace (PT_SETREGS, get_ptrace_pid (inferior_ptid),
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+	perror_with_name (_("Couldn't write registers"));
+
+      if (regnum != -1)
+	return;
+    }
+
+  if (regnum == -1
+      || regnum >= gdbarch_fp0_regnum (get_regcache_arch (regcache)))
+    {
+      struct fpreg fpregs;
+
+      if (ptrace (PT_GETFPREGS, get_ptrace_pid (inferior_ptid),
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+	perror_with_name (_("Couldn't get floating point status"));
+
+      mips_fbsd_collect_fpregs (regcache, regnum, (char *) &fpregs,
+				sizeof (f_register_t));
+
+      if (ptrace (PT_SETFPREGS, get_ptrace_pid (inferior_ptid),
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+	perror_with_name (_("Couldn't write floating point status"));
+    }
+}
+
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+void _initialize_mips_fbsd_nat (void);
+
+void
+_initialize_mips_fbsd_nat (void)
+{
+  struct target_ops *t;
+
+  t = inf_ptrace_target ();
+  t->to_fetch_registers = mips_fbsd_fetch_inferior_registers;
+  t->to_store_registers = mips_fbsd_store_inferior_registers;
+  fbsd_nat_add_target (t);
+}