[RFA] New target am33-linux (mn10300)

[RFA] New target am33-linux (mn10300)

[Michael Snyder]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

This is an embedded linux target for am33 (mn10300).  The rest of the
toolchain (gcc, binutils) has already been contributed.  This bit has been
languishing untended for a while.



[-- Attachment #2: mn10300-linux --]
[-- Type: text/plain, Size: 11758 bytes --]

2005-04-29  Michael Snyder  <msnyder@redhat.com>

	* mn10300-linux-tdep.c: New file.
	* Makefile.in: Add rule for mn10300-linux-tdep.o.
	* configure.tgt: Add rule for am33 / mn10300-linux.
	* mn10300-tdep.h: Add E_FPCR_REGNUM, E_FS0_REGNUM.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.724
diff -p -r1.724 Makefile.in
*** Makefile.in	29 Apr 2005 14:21:21 -0000	1.724
--- Makefile.in	30 Apr 2005 00:27:09 -0000
*************** mips-tdep.o: mips-tdep.c $(defs_h) $(gdb
*** 2300,2305 ****
--- 2300,2307 ----
  	$(floatformat_h)
  mipsv4-nat.o: mipsv4-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) $(target_h) \
  	$(regcache_h) $(gregset_h)
+ mn10300-linux-tdep.o: mn10300-linux-tdep.c $(defs_h) $(gdbcore_h) \
+ 	$(gdb_string_h) $(regcache_h) $(mn10300_tdep_h)
  mn10300-tdep.o: mn10300-tdep.c $(defs_h) $(arch_utils_h) $(dis_asm_h) \
  	$(gdbtypes_h) $(regcache_h) $(gdb_string_h) $(gdb_assert_h) \
  	$(frame_h) $(frame_unwind_h) $(frame_base_h) $(trad_frame_h) \
Index: configure.tgt
===================================================================
RCS file: /cvs/src/src/gdb/configure.tgt,v
retrieving revision 1.163
diff -p -r1.163 configure.tgt
*** configure.tgt	26 Apr 2005 21:47:21 -0000	1.163
--- configure.tgt	30 Apr 2005 00:27:09 -0000
***************
*** 11,16 ****
--- 11,17 ----
  case "${target_cpu}" in
  
  alpha*)			gdb_target_cpu=alpha ;;
+ am33_2.0*)              gdb_target_cpu=mn10300 ;;
  arm*)			gdb_target_cpu=arm ;;
  avr*)			gdb_target_cpu=avr ;;
  hppa*)			gdb_target_cpu=pa ;;
*************** alpha*-*-netbsd* | alpha*-*-knetbsd*-gnu
*** 47,52 ****
--- 48,56 ----
  alpha*-*-openbsd*)	gdb_target=nbsd ;;
  alpha*-*-*)		gdb_target=alpha ;;
  
+ # mn10300 / am33 liunux
+ am33_2.0*-*-linux*)	gdb_target=linux ;;
+ 
  arm*-wince-pe)		gdb_target=wince ;;
  arm*-*-linux*)		gdb_target=linux
  			build_gdbserver=yes
Index: mn10300-tdep.h
===================================================================
RCS file: /cvs/src/src/gdb/mn10300-tdep.h,v
retrieving revision 1.3
diff -p -r1.3 mn10300-tdep.h
*** mn10300-tdep.h	18 Apr 2005 23:14:33 -0000	1.3
--- mn10300-tdep.h	30 Apr 2005 00:27:09 -0000
*************** enum {
*** 47,53 ****
    E_MCRH_REGNUM = 26,
    E_MCRL_REGNUM = 27,
    E_MCVF_REGNUM = 28,
!   E_NUM_REGS = 32
  };
  
  enum movm_register_bits {
--- 47,55 ----
    E_MCRH_REGNUM = 26,
    E_MCRL_REGNUM = 27,
    E_MCVF_REGNUM = 28,
!   E_FPCR_REGNUM = 29,
!   E_NUM_REGS = 32, 
!   E_FS0_REGNUM = 32
  };
  
  enum movm_register_bits {
Index: mn10300-linux-tdep.c
===================================================================
RCS file: mn10300-linux-tdep.c
diff -N mn10300-linux-tdep.c
*** /dev/null	1 Jan 1970 00:00:00 -0000
--- mn10300-linux-tdep.c	30 Apr 2005 00:28:15 -0000
***************
*** 0 ****
--- 1,221 ----
+ /* Target-dependent code for the Matsushita MN10300 for GDB, the GNU debugger.
+    Copyright 2003
+    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"
+ #include "gdbcore.h"
+ #include "gdb_string.h"
+ #include "regcache.h"
+ #include "mn10300-tdep.h"
+ 
+ #include <stdlib.h>
+ 
+ /* Transliterated from <asm-mn10300/elf.h>...  */
+ #define ELF_NGREG 27
+ #define ELF_NFPREG 32
+ 
+ typedef unsigned char elf_greg_t[4];
+ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
+ 
+ typedef unsigned char elf_fpreg_t[4];
+ typedef struct
+ {
+   elf_fpreg_t fpregs[ELF_NFPREG];
+   unsigned char fpcr[4];
+ } elf_fpregset_t;
+ 
+ /* elf_gregset_t register indices stolen from include/asm-mn10300/ptrace.h.  */
+ #define ELF_GREGSET_T_REG_INDEX_A3	0
+ #define ELF_GREGSET_T_REG_INDEX_A2	1
+ #define ELF_GREGSET_T_REG_INDEX_D3	2
+ #define	ELF_GREGSET_T_REG_INDEX_D2	3
+ #define ELF_GREGSET_T_REG_INDEX_MCVF	4
+ #define	ELF_GREGSET_T_REG_INDEX_MCRL	5
+ #define ELF_GREGSET_T_REG_INDEX_MCRH	6
+ #define	ELF_GREGSET_T_REG_INDEX_MDRQ	7
+ #define	ELF_GREGSET_T_REG_INDEX_E1	8
+ #define	ELF_GREGSET_T_REG_INDEX_E0	9
+ #define	ELF_GREGSET_T_REG_INDEX_E7	10
+ #define	ELF_GREGSET_T_REG_INDEX_E6	11
+ #define	ELF_GREGSET_T_REG_INDEX_E5	12
+ #define	ELF_GREGSET_T_REG_INDEX_E4	13
+ #define	ELF_GREGSET_T_REG_INDEX_E3	14
+ #define	ELF_GREGSET_T_REG_INDEX_E2	15
+ #define	ELF_GREGSET_T_REG_INDEX_SP	16
+ #define	ELF_GREGSET_T_REG_INDEX_LAR	17
+ #define	ELF_GREGSET_T_REG_INDEX_LIR	18
+ #define	ELF_GREGSET_T_REG_INDEX_MDR	19
+ #define	ELF_GREGSET_T_REG_INDEX_A1	20
+ #define	ELF_GREGSET_T_REG_INDEX_A0	21
+ #define	ELF_GREGSET_T_REG_INDEX_D1	22
+ #define	ELF_GREGSET_T_REG_INDEX_D0	23
+ #define ELF_GREGSET_T_REG_INDEX_ORIG_D0	24
+ #define	ELF_GREGSET_T_REG_INDEX_EPSW	25
+ #define	ELF_GREGSET_T_REG_INDEX_PC	26
+ 
+ /* Unpack an elf_gregset_t into GDB's register cache.  */
+ 
+ static void
+ supply_gregset (elf_gregset_t *gregsetp)
+ {
+   elf_greg_t *regp = *gregsetp;
+   char zerobuf[MAX_REGISTER_SIZE];
+   int regi;
+ 
+   memset (zerobuf, 0, MAX_REGISTER_SIZE);
+ 
+   regcache_raw_supply (current_regcache, E_D0_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_D0));
+   regcache_raw_supply (current_regcache, E_D1_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_D1));
+   regcache_raw_supply (current_regcache, E_D2_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_D2));
+   regcache_raw_supply (current_regcache, E_D3_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_D3));
+   regcache_raw_supply (current_regcache, E_A0_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_A0));
+   regcache_raw_supply (current_regcache, E_A0_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_A1));
+   regcache_raw_supply (current_regcache, E_A2_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_A2));
+   regcache_raw_supply (current_regcache, E_A3_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_A3));
+   regcache_raw_supply (current_regcache, E_SP_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_SP));
+   regcache_raw_supply (current_regcache, E_PC_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_PC));
+   regcache_raw_supply (current_regcache, E_MDR_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_MDR));
+   regcache_raw_supply (current_regcache, E_PSW_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_EPSW));
+   regcache_raw_supply (current_regcache, E_LIR_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_LIR));
+   regcache_raw_supply (current_regcache, E_LAR_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_LAR));
+   regcache_raw_supply (current_regcache, E_MDRQ_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_MDRQ));
+   regcache_raw_supply (current_regcache, E_E0_REGNUM,   
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_E0));
+   regcache_raw_supply (current_regcache, E_E0_REGNUM + 1, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_E1));
+   regcache_raw_supply (current_regcache, E_E0_REGNUM + 2, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_E2));
+   regcache_raw_supply (current_regcache, E_E0_REGNUM + 3, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_E3));
+   regcache_raw_supply (current_regcache, E_E0_REGNUM + 4, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_E4));
+   regcache_raw_supply (current_regcache, E_E0_REGNUM + 5, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_E5));
+   regcache_raw_supply (current_regcache, E_E0_REGNUM + 6, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_E6));
+   regcache_raw_supply (current_regcache, E_E0_REGNUM + 7, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_E7));
+ 
+   /* ssp, msp, and usp are inaccessible.  */
+   regcache_raw_supply (current_regcache, E_E0_REGNUM + 8, zerobuf);
+   regcache_raw_supply (current_regcache, E_E0_REGNUM + 9, zerobuf);
+   regcache_raw_supply (current_regcache, E_E0_REGNUM + 10, zerobuf);
+ 
+   regcache_raw_supply (current_regcache, E_MCRH_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_MCRH));
+   regcache_raw_supply (current_regcache, E_MCRL_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_MCRL));
+   regcache_raw_supply (current_regcache, E_MCVF_REGNUM, 
+ 		       (void *) (regp + ELF_GREGSET_T_REG_INDEX_MCVF));
+ 
+   /* The two unused registers beyond fpcr are inaccessible.  */
+   regcache_raw_supply (current_regcache, E_FPCR_REGNUM + 1, zerobuf);
+   regcache_raw_supply (current_regcache, E_FPCR_REGNUM + 2, zerobuf);
+ }
+ 
+ /* Unpack an elf_fpregset_t into GDB's register cache.  */
+ 
+ static void
+ supply_fpregset (elf_fpregset_t *fpregsetp)
+ {
+   register int regi;
+ 
+   for (regi = 0; regi < ELF_NFPREG; regi++)
+     regcache_raw_supply (current_regcache, E_FS0_REGNUM + regi, 
+ 			 (void *) &fpregsetp->fpregs[regi]);
+ 
+   regcache_raw_supply (current_regcache, E_FPCR_REGNUM, 
+ 		       (void *) &fpregsetp->fpcr);
+ 
+ }
+ 
+ /*  Use a local version of this function to get the correct types for
+     regsets, until multi-arch core support is ready.  */
+ 
+ static void
+ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
+ 		      int which, CORE_ADDR reg_addr)
+ {
+   elf_gregset_t gregset;
+   elf_fpregset_t fpregset;
+ 
+   if (which == 0)
+     {
+       if (core_reg_size == sizeof (gregset))
+ 	{
+ 	  memcpy ((void *) &gregset, core_reg_sect, sizeof (gregset));
+ 	  supply_gregset (&gregset);
+ 	}
+       else
+ 	{
+ 	  warning ("wrong size gregset struct in core file");
+ 	}
+     }
+   else if (which == 2)
+     {
+       if (NUM_REGS <= E_FS0_REGNUM + 31)
+ 	{
+ 	  warning ("Wrong mn10300 architecture for core file.\n"
+ 	           "Hint: try \"set architecture am33-2\" before loading core file.");
+ 	}
+       else if (core_reg_size == sizeof (fpregset))
+ 	{
+ 	  memcpy ((void *) &fpregset, core_reg_sect, sizeof (fpregset));
+ 	  supply_fpregset (&fpregset);
+ 	}
+       else
+ 	{
+ 	  warning ("wrong size fpregset struct in core file");
+ 	}
+     }
+ }
+ 
+ /* Register that we are able to handle ELF file formats using standard
+    procfs "regset" structures.  */
+ 
+ static struct core_fns regset_core_fns =
+ {
+   bfd_target_elf_flavour,		/* core_flavour */
+   default_check_format,			/* check_format */
+   default_core_sniffer,			/* core_sniffer */
+   fetch_core_registers,			/* core_read_registers */
+   NULL					/* next */
+ };
+ 
+ void
+ _initialize_mn10300_linux_tdep (void)
+ {
+   deprecated_add_core_fns (&regset_core_fns);
+ }
Index: config/mn10300/linux.mt
===================================================================
RCS file: config/mn10300/linux.mt
diff -N config/mn10300/linux.mt
*** /dev/null	1 Jan 1970 00:00:00 -0000
--- config/mn10300/linux.mt	30 Apr 2005 00:28:15 -0000
***************
*** 0 ****
--- 1,6 ----
+ # Target: Matsushita mn10300 running Linux
+ TDEPFILES= mn10300-tdep.o mn10300-linux-tdep.o corelow.o solib.o solib-svr4.o
+ DEPRECATED_TM_FILE= tm-linux.h
+ 
+ # SIM_OBS = remote-sim.o
+ # SIM = ../sim/mn10300/libsim.a

Re: [RFA] New target am33-linux (mn10300)

[Daniel Jacobowitz]

On Fri, Apr 29, 2005 at 05:49:15PM -0700, Michael Snyder wrote:
> Index: mn10300-linux-tdep.c
> ===================================================================
> RCS file: mn10300-linux-tdep.c
> diff -N mn10300-linux-tdep.c
> *** /dev/null	1 Jan 1970 00:00:00 -0000
> --- mn10300-linux-tdep.c	30 Apr 2005 00:28:15 -0000
> ***************
> *** 0 ****
> --- 1,221 ----
> + /* Target-dependent code for the Matsushita MN10300 for GDB, the GNU debugger.
> +    Copyright 2003
> +    Free Software Foundation, Inc.

Welcome to 2005 :-)  This has indeed been languishing...

> + /* Transliterated from <asm-mn10300/elf.h>...  */
> + #define ELF_NGREG 27
> + #define ELF_NFPREG 32
> + 
> + typedef unsigned char elf_greg_t[4];
> + typedef elf_greg_t elf_gregset_t[ELF_NGREG];
> + 
> + typedef unsigned char elf_fpreg_t[4];
> + typedef struct
> + {
> +   elf_fpreg_t fpregs[ELF_NFPREG];
> +   unsigned char fpcr[4];
> + } elf_fpregset_t;

Past experience tells me that this is a bad idea; please pick names for
these types (and the other constants) which won't conflict with types
in the system headers.

> + /*  Use a local version of this function to get the correct types for
> +     regsets, until multi-arch core support is ready.  */
> + 
> + static void
> + fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
> + 		      int which, CORE_ADDR reg_addr)

Lots of stray braces in this function.  But also...

> + void
> + _initialize_mn10300_linux_tdep (void)
> + {
> +   deprecated_add_core_fns (&regset_core_fns);
> + }

... that's a pretty good hint that you should update this.  Please see
i386_regset_from_core_section instead.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [RFA] New target am33-linux (mn10300)

[Mark Kettenis]

   Date: Fri, 29 Apr 2005 17:49:15 -0700
   From: Michael Snyder <msnyder@sonic.net>

   This is an embedded linux target for am33 (mn10300).  The rest of
   the toolchain (gcc, binutils) has already been contributed.  This
   bit has been languishing untended for a while.

And is well past its "best before" date by now :-(.

It uses DEPRECATED_TM_FILE, and we're not allowd to check in anything
new that uses it.  Unfortunately, this means you can only check this
in without working shared library stuff.  Personally I think we should
allow "DEPRECATED_TM_FILE= solib.h" until the shared libarry stuff is
properly fixed.  Anyway, you seem to have left out the tm-linux.h that
you reference.

But what's worse is that this uses deprecated_add_core_fns, for which
we have an alternative.  Please implement
xxx_regset_from_core_section() and the associated register sets.
While you're at it, I think it is a good idea to get rid of the
ELF_XXX and elf_xxx defines and typedefs you copied from
<asm-mn10300/elf.h>.  These tend to leak into the namespace on Linux
systems and might cause problems.  If you define a sensible register
set, you'll only need these constants once, so you don't really need
these types.

By the time you've done this, I might have eliminated the need fro
DEPRECATED_TM_FILE.

Mark

   2005-04-29  Michael Snyder  <msnyder@redhat.com>

	   * mn10300-linux-tdep.c: New file.
	   * Makefile.in: Add rule for mn10300-linux-tdep.o.
	   * configure.tgt: Add rule for am33 / mn10300-linux.
	   * mn10300-tdep.h: Add E_FPCR_REGNUM, E_FS0_REGNUM.

Re: [RFA] New target am33-linux (mn10300)

[Daniel Jacobowitz]

On Sat, Apr 30, 2005 at 01:03:16PM +0200, Mark Kettenis wrote:
> It uses DEPRECATED_TM_FILE, and we're not allowd to check in anything
> new that uses it.  Unfortunately, this means you can only check this
> in without working shared library stuff.  Personally I think we should
> allow "DEPRECATED_TM_FILE= solib.h" until the shared libarry stuff is
> properly fixed.  Anyway, you seem to have left out the tm-linux.h that
> you reference.

I actually caught this bit in my review and decided to ignore it.  He
didn't leave out his tm-linux.h; he'll get the pre-existing
config/tm-linux.h, and I can make a reasonable argument that this is
not a new use of DEPRECATED_TM_FILE.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [RFA] New target am33-linux (mn10300)

[Mark Kettenis]

   Date: Sat, 30 Apr 2005 09:58:47 -0400
   From: Daniel Jacobowitz <drow@false.org>

   On Sat, Apr 30, 2005 at 01:03:16PM +0200, Mark Kettenis wrote:
   > It uses DEPRECATED_TM_FILE, and we're not allowd to check in anything
   > new that uses it.  Unfortunately, this means you can only check this
   > in without working shared library stuff.  Personally I think we should
   > allow "DEPRECATED_TM_FILE= solib.h" until the shared libarry stuff is
   > properly fixed.  Anyway, you seem to have left out the tm-linux.h that
   > you reference.

   I actually caught this bit in my review and decided to ignore it.  He
   didn't leave out his tm-linux.h; he'll get the pre-existing
   config/tm-linux.h, and I can make a reasonable argument that this is
   not a new use of DEPRECATED_TM_FILE.

Ah, ok.  That should be an explicit config/tm-linux.h then.  But
that's bad, because that includes some gunk that I'm not sure is
needed anymore.  I've never moved towards removing that gunk, since
I'm not confident that it doesn't hurt one of the not-so-mainstream
Linux targets.  Adding another target to that list kinda sucks.

Anyway, can you elaborate on why this isn't a new use of
DEPRECATED_TM_FILE?  I vividly remember the line

DEPRECATED_TM_FILE= solib.h

being backed out from config/mips/obsd64.mt because it wasn't acceptable.

Mark

Re: [RFA] New target am33-linux (mn10300)

[Daniel Jacobowitz]

On Sat, Apr 30, 2005 at 05:01:55PM +0200, Mark Kettenis wrote:
> Ah, ok.  That should be an explicit config/tm-linux.h then.  But
> that's bad, because that includes some gunk that I'm not sure is
> needed anymore.  I've never moved towards removing that gunk, since
> I'm not confident that it doesn't hurt one of the not-so-mainstream
> Linux targets.  Adding another target to that list kinda sucks.

I'm pretty sure it doesn't.  In any case, when you're done with
solib.h, we can handle it.  I know what most of it refers to.

> Anyway, can you elaborate on why this isn't a new use of
> DEPRECATED_TM_FILE?  I vividly remember the line
> 
> DEPRECATED_TM_FILE= solib.h
> 
> being backed out from config/mips/obsd64.mt because it wasn't acceptable.

Andrew and I have distinctly different ideas of what is considered
acceptable.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [RFA] New target am33-linux (mn10300)

[Eli Zaretskii]

> Date: Fri, 29 Apr 2005 17:49:15 -0700
> From: Michael Snyder <msnyder@sonic.net>
> 
> This is an embedded linux target for am33 (mn10300).

Should this go into NEWS?