Message ID | 20161123205902.90995-4-jhb@FreeBSD.org |
---|---|
State | New |
Headers | show |
A few comments, mostly cosmetic in nature. On 11/23/2016 02:59 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/mips-fbsd-nat.c b/gdb/mips-fbsd-nat.c > new file mode 100644 > index 0000000..67ce683 > --- /dev/null > +++ b/gdb/mips-fbsd-nat.c > @@ -0,0 +1,141 @@ > +/* Target-dependent code for FreeBSD/mips. FreeBSD/MIPS native support? > + > + 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 int With GDB having switched to C++, using bool here sounds more appropriate. > +getregs_supplies (struct gdbarch *gdbarch, int regnum) get_regs_supplies? > +{ > + 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 > +mipsfbsd_fetch_inferior_registers (struct target_ops *ops, > + struct regcache *regcache, int regnum) Same as patch 2/3, mips_fbsd_* sounds more appropriate for the name? > +{ > + 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) ®s, 0) == -1) > + perror_with_name (_("Couldn't get registers")); > + > + mipsfbsd_supply_gregs (regcache, regnum, ®s, 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")); "Couldn't get floating point registers"? > + > + mipsfbsd_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 > +mipsfbsd_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) ®s, 0) == -1) > + perror_with_name (_("Couldn't get registers")); > + > + mipsfbsd_collect_gregs (regcache, regnum, (char *) ®s, > + sizeof (register_t)); > + > + if (ptrace (PT_SETREGS, get_ptrace_pid (inferior_ptid), > + (PTRACE_TYPE_ARG3) ®s, 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")); "Couldn't get floating point registers"? > + > + mipsfbsd_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")); "Couldn't get floating point registers"? > + } > +} > + > + Spurious newline above. > +/* Provide a prototype to silence -Wmissing-prototypes. */ > +void _initialize_mipsfbsd_nat (void); > + > +void > +_initialize_mipsfbsd_nat (void) > +{ > + struct target_ops *t; > + > + t = inf_ptrace_target (); > + t->to_fetch_registers = mipsfbsd_fetch_inferior_registers; > + t->to_store_registers = mipsfbsd_store_inferior_registers; > + fbsd_nat_add_target (t); > +} > -- 2.9.2 > Otherwise looks good to me. Thanks, Luis
On Friday, November 25, 2016 10:25:53 PM Luis Machado wrote: > On 11/23/2016 02:59 PM, John Baldwin wrote: > > @@ -0,0 +1,141 @@ > > +/* Target-dependent code for FreeBSD/mips. > > FreeBSD/MIPS native support? Whoops, 'Native-dependent' seems to be what many other native targets use, so I'll go with that. > > +/* Determine if PT_GETREGS fetches this register. */ > > + > > +static int > > With GDB having switched to C++, using bool here sounds more appropriate. Ok. This was actually borrowed from mips-nbsd-tdep.c, but I can use bool here. > > +getregs_supplies (struct gdbarch *gdbarch, int regnum) > > get_regs_supplies? (Also copied as above). The ptrace operation to which this refers is PT_GETREGS rather than PT_GET_REGS, so I think 'getregs' here is better. > > + 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")); > > "Couldn't get floating point registers"? Most targets use "status" rather than "registers" (including Linux/i386 and Linux/x86-64). (Curiously, sparc-nat.c uses both "status" and "registers".) > > + } > > +} > > + > > + > > Spurious newline above. There's actually a form feed (^L) in there as in many other targets before the _initialize_foo() routine. mips-linux-*.c don't include one, but many other targets do. This may be a no-longer-followed rule though (it is still in the GNU coding standards at the end of 5.1)?
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 092ca9e..83fc91b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2016-11-23 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-11-23 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 d89a17f..e0ca5e7 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..67ce683 --- /dev/null +++ b/gdb/mips-fbsd-nat.c @@ -0,0 +1,141 @@ +/* Target-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 int +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 +mipsfbsd_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) ®s, 0) == -1) + perror_with_name (_("Couldn't get registers")); + + mipsfbsd_supply_gregs (regcache, regnum, ®s, 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")); + + mipsfbsd_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 +mipsfbsd_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) ®s, 0) == -1) + perror_with_name (_("Couldn't get registers")); + + mipsfbsd_collect_gregs (regcache, regnum, (char *) ®s, + sizeof (register_t)); + + if (ptrace (PT_SETREGS, get_ptrace_pid (inferior_ptid), + (PTRACE_TYPE_ARG3) ®s, 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")); + + mipsfbsd_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_mipsfbsd_nat (void); + +void +_initialize_mipsfbsd_nat (void) +{ + struct target_ops *t; + + t = inf_ptrace_target (); + t->to_fetch_registers = mipsfbsd_fetch_inferior_registers; + t->to_store_registers = mipsfbsd_store_inferior_registers; + fbsd_nat_add_target (t); +}