Re: [RFA] Rename armbsd-nat.c to armnbsd-nat.c

[Fernando Nasser <fnasser@redhat.com>]

Yes, it makes sense.

Please check it in.

Thanks.
Fernando

Ben Harris wrote:
> 
> Richard Earnshaw's recent patch for NetBSD/arm support inexplicably called
> the native support file armbsd-nat.c.  For consistency with the other
> NetBSD ports, this should have been armnbsd-nat.c.
> 
> I suggested this when the patch was proposed.  See
> <URL:http://sources.redhat.com/ml/gdb-patches/2001-10/msg00327.html>.
> 
> 2001-12-17  Ben Harris  <bjh21@netbsd.org>
> 
>         * armbsd-nat.c: Remove file, renamed to armnbsd-nat.c.
>         * armnbsd-nat.c: New file, renamed from armbsd-nat.c.
>         * Makefile.in: Rename armbsd-nat.c to armnbsd-nat.c.
>         * config/arm/nbsd.mh: Likewise.
> 
> Index: Makefile.in
> ===================================================================
> RCS file: /cvs/src/src/gdb/Makefile.in,v
> retrieving revision 1.142
> diff -u -c -3 -p -r1.142 Makefile.in
> *** Makefile.in 2001/12/17 16:23:02     1.142
> --- Makefile.in 2001/12/17 17:12:48
> *************** unexport CHILLFLAGS CHILL_LIB CHILL_FOR_
> *** 1177,1183 ****
>   ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.c \
>         29k-share/udi/udi2go32.c \
>         a29k-tdep.c a68v-nat.c alpha-nat.c alpha-tdep.c \
> !       arm-linux-nat.c arm-linux-tdep.c arm-tdep.c armbsd-nat.c \
>         coff-solib.c \
>         core-sol2.c core-regset.c core-aout.c corelow.c \
>         dcache.c delta68-nat.c dpx2-nat.c dstread.c exec.c fork-child.c \
> --- 1177,1183 ----
>   ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.c \
>         29k-share/udi/udi2go32.c \
>         a29k-tdep.c a68v-nat.c alpha-nat.c alpha-tdep.c \
> !       arm-linux-nat.c arm-linux-tdep.c arm-tdep.c armnbsd-nat.c \
>         coff-solib.c \
>         core-sol2.c core-regset.c core-aout.c corelow.c \
>         dcache.c delta68-nat.c dpx2-nat.c dstread.c exec.c fork-child.c \
> *************** arm-linux-tdep.o: arm-linux-tdep.c $(def
> *** 1258,1264 ****
>   arm-tdep.o: arm-tdep.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h) \
>         $(gdbcore_h) $(regcache_h) $(doublest_h) $(value_h)
> 
> ! armbsd-nat.o: armbsd-nat.c $(defs_h)
> 
>   bcache.o: bcache.c $(bcache_h) $(defs_h)
> 
> --- 1258,1264 ----
>   arm-tdep.o: arm-tdep.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h) \
>         $(gdbcore_h) $(regcache_h) $(doublest_h) $(value_h)
> 
> ! armnbsd-nat.o: armnbsd-nat.c $(defs_h)
> 
>   bcache.o: bcache.c $(bcache_h) $(defs_h)
> 
> Index: armbsd-nat.c
> ===================================================================
> RCS file: armbsd-nat.c
> diff -N armbsd-nat.c
> *** /sourceware/cvs-tmp/cvsCEvtVO       Mon Dec 17 09:12:53 2001
> --- /dev/null   Tue May  5 13:32:27 1998
> ***************
> *** 1,96 ****
> - /* Native-dependent code for BSD Unix running on ARM's, for GDB.
> -    Copyright 1988, 1989, 1991, 1992, 1994, 1996, 1999 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 2 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, write to the Free Software
> -    Foundation, Inc., 59 Temple Place - Suite 330,
> -    Boston, MA 02111-1307, USA.  */
> -
> - #include "defs.h"
> -
> - #ifdef FETCH_INFERIOR_REGISTERS
> - #include <sys/types.h>
> - #include <sys/ptrace.h>
> - #include <machine/reg.h>
> - #include <machine/frame.h>
> - #include "inferior.h"
> -
> - void
> - fetch_inferior_registers (regno)
> -      int regno;
> - {
> -   struct reg inferior_registers;
> -   struct fpreg inferior_fpregisters;
> -
> -   ptrace (PT_GETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &inferior_registers, 0);
> -   memcpy (&registers[REGISTER_BYTE (0)], &inferior_registers,
> -         16 * sizeof (unsigned int));
> -   memcpy (&registers[REGISTER_BYTE (PS_REGNUM)], &inferior_registers.r_cpsr,
> -         sizeof (unsigned int));
> -   ptrace (PT_GETFPREGS, inferior_pid, (PTRACE_ARG3_TYPE) &inferior_fpregisters,
> -         0);
> -   memcpy (&registers[REGISTER_BYTE (F0_REGNUM)], &inferior_fpregisters.fpr[0],
> -         8 * sizeof (fp_reg_t));
> -   memcpy (&registers[REGISTER_BYTE (FPS_REGNUM)],
> -         &inferior_fpregisters.fpr_fpsr, sizeof (unsigned int));
> -   registers_fetched ();
> - }
> -
> - void
> - store_inferior_registers (regno)
> -      int regno;
> - {
> -   struct reg inferior_registers;
> -
> -   memcpy (&inferior_registers, &registers[REGISTER_BYTE (0)],
> -         16 * sizeof (unsigned int));
> -   memcpy (&inferior_registers.r_cpsr, &registers[REGISTER_BYTE (PS_REGNUM)],
> -         sizeof (unsigned int));
> -   ptrace (PT_SETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &inferior_registers, 0);
> -
> -   /* XXX Set FP regs. */
> - }
> -
> - struct md_core
> - {
> -   struct reg intreg;
> -   struct fpreg freg;
> - };
> -
> - void
> - fetch_core_registers (core_reg_sect, core_reg_size, which, ignore)
> -      char *core_reg_sect;
> -      unsigned core_reg_size;
> -      int which;
> -      CORE_ADDR ignore;
> - {
> -   struct md_core *core_reg = (struct md_core *) core_reg_sect;
> -
> -   /* integer registers */
> -   memcpy (&registers[REGISTER_BYTE (0)], &core_reg->intreg,
> -         sizeof (struct reg));
> -   /* floating point registers */
> -   /* XXX */
> - }
> -
> - #else
> - #error Not FETCH_INFERIOR_REGISTERS
> - #endif /* !FETCH_INFERIOR_REGISTERS */
> -
> - int
> - get_longjmp_target (CORE_ADDR *addr)
> - {
> -   return 0;
> - }
> --- 0 ----
> Index: armnbsd-nat.c
> ===================================================================
> RCS file: armnbsd-nat.c
> diff -N armnbsd-nat.c
> *** /dev/null   Tue May  5 13:32:27 1998
> --- armnbsd-nat.c       Mon Dec 17 09:12:48 2001
> ***************
> *** 0 ****
> --- 1,96 ----
> + /* Native-dependent code for BSD Unix running on ARM's, for GDB.
> +    Copyright 1988, 1989, 1991, 1992, 1994, 1996, 1999 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 2 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, write to the Free Software
> +    Foundation, Inc., 59 Temple Place - Suite 330,
> +    Boston, MA 02111-1307, USA.  */
> +
> + #include "defs.h"
> +
> + #ifdef FETCH_INFERIOR_REGISTERS
> + #include <sys/types.h>
> + #include <sys/ptrace.h>
> + #include <machine/reg.h>
> + #include <machine/frame.h>
> + #include "inferior.h"
> +
> + void
> + fetch_inferior_registers (regno)
> +      int regno;
> + {
> +   struct reg inferior_registers;
> +   struct fpreg inferior_fpregisters;
> +
> +   ptrace (PT_GETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &inferior_registers, 0);
> +   memcpy (&registers[REGISTER_BYTE (0)], &inferior_registers,
> +         16 * sizeof (unsigned int));
> +   memcpy (&registers[REGISTER_BYTE (PS_REGNUM)], &inferior_registers.r_cpsr,
> +         sizeof (unsigned int));
> +   ptrace (PT_GETFPREGS, inferior_pid, (PTRACE_ARG3_TYPE) &inferior_fpregisters,
> +         0);
> +   memcpy (&registers[REGISTER_BYTE (F0_REGNUM)], &inferior_fpregisters.fpr[0],
> +         8 * sizeof (fp_reg_t));
> +   memcpy (&registers[REGISTER_BYTE (FPS_REGNUM)],
> +         &inferior_fpregisters.fpr_fpsr, sizeof (unsigned int));
> +   registers_fetched ();
> + }
> +
> + void
> + store_inferior_registers (regno)
> +      int regno;
> + {
> +   struct reg inferior_registers;
> +
> +   memcpy (&inferior_registers, &registers[REGISTER_BYTE (0)],
> +         16 * sizeof (unsigned int));
> +   memcpy (&inferior_registers.r_cpsr, &registers[REGISTER_BYTE (PS_REGNUM)],
> +         sizeof (unsigned int));
> +   ptrace (PT_SETREGS, inferior_pid, (PTRACE_ARG3_TYPE) &inferior_registers, 0);
> +
> +   /* XXX Set FP regs. */
> + }
> +
> + struct md_core
> + {
> +   struct reg intreg;
> +   struct fpreg freg;
> + };
> +
> + void
> + fetch_core_registers (core_reg_sect, core_reg_size, which, ignore)
> +      char *core_reg_sect;
> +      unsigned core_reg_size;
> +      int which;
> +      CORE_ADDR ignore;
> + {
> +   struct md_core *core_reg = (struct md_core *) core_reg_sect;
> +
> +   /* integer registers */
> +   memcpy (&registers[REGISTER_BYTE (0)], &core_reg->intreg,
> +         sizeof (struct reg));
> +   /* floating point registers */
> +   /* XXX */
> + }
> +
> + #else
> + #error Not FETCH_INFERIOR_REGISTERS
> + #endif /* !FETCH_INFERIOR_REGISTERS */
> +
> + int
> + get_longjmp_target (CORE_ADDR *addr)
> + {
> +   return 0;
> + }
> Index: config/arm/nbsd.mh
> ===================================================================
> RCS file: /cvs/src/src/gdb/config/arm/nbsd.mh,v
> retrieving revision 1.1
> diff -u -c -3 -p -r1.1 nbsd.mh
> *** nbsd.mh     2001/12/17 16:23:02     1.1
> --- nbsd.mh     2001/12/17 17:12:48
> ***************
> *** 1,5 ****
>   # Host ARM running NetBSD
>   XDEPFILES= ser-tcp.o
> ! NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o armbsd-nat.o
>   XM_FILE=xm-nbsd.h
>   NAT_FILE=nm-nbsd.h
> --- 1,5 ----
>   # Host ARM running NetBSD
>   XDEPFILES= ser-tcp.o
> ! NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o armnbsd-nat.o
>   XM_FILE=xm-nbsd.h
>   NAT_FILE=nm-nbsd.h
> 
> --
> Ben Harris                                                   <bjh21@netbsd.org>
> Portmaster, NetBSD/arm26               <URL:http://www.netbsd.org/Ports/arm26/>

-- 
Fernando Nasser
Red Hat - Toronto                       E-Mail:  fnasser@redhat.com
2323 Yonge Street, Suite #300
Toronto, Ontario   M4P 2C9