[patch] MIPS16e support in simulator.

[patch] MIPS16e support in simulator.

[David Ung]

This patch adds MIPS16e support in the GNU simulator.  I've configure
targets mipsisa32*-*-*, mipsisa32r2*-*-*, mipsisa64*-*-*,
mipsisa64r2*-*-* to generate both normal and mips16e code.

David.

2005-06-09  David Ung  <davidu@mips.com>
	    Nigel Stephens  <nigel@mips.com>

	* mips.igen: New mips16e model and include m16e.igen.
	(check_u64): Add mips16e tag.
	* m16e.igen: New file for MIPS16e instructions.
	* configure.ac (mipsisa32*-*-*, mipsisa32r2*-*-*, mipsisa64*-*-*,
	mipsisa64r2*-*-*): Change sim_gen to M16, add mips16 and mips16e
	models.
	* configure: Regenerate.

Index: src/sim/mips/mips.igen
===================================================================
RCS file: /cvsroot/gcc/src-cvs/src/sim/mips/mips.igen,v
retrieving revision 1.58
diff -c -p -b -r1.58 mips.igen
*** src/sim/mips/mips.igen	26 May 2005 21:31:57 -0000	1.58
--- src/sim/mips/mips.igen	9 Jun 2005 16:48:28 -0000
***************
*** 68,73 ****
--- 68,74 ----
  //  Instructions for the ASEs are in separate .igen files.
  //  ASEs add instructions on to a base ISA.
  :model:::mips16:mips16:			// m16.igen (and m16.dc)
+ :model:::mips16e:mips16e:		// m16e.igen
  :model:::mips3d:mips3d:			// mips3d.igen
  :model:::mdmx:mdmx:			// mdmx.igen
  
***************
*** 491,496 ****
--- 492,498 ----
  }
  
  :function:::void:check_u64:instruction_word insn
+ *mips16e:
  *mips64:
  *mips64r2:
  {
***************
*** 5689,5694 ****
--- 5691,5697 ----
  
  :include:::mips3264r2.igen
  :include:::m16.igen
+ :include:::m16e.igen
  :include:::mdmx.igen
  :include:::mips3d.igen
  :include:::sb1.igen

Index: src/sim/mips/configure.ac
===================================================================
RCS file: /cvsroot/gcc/src-cvs/src/sim/mips/configure.ac,v
retrieving revision 1.4
diff -c -p -b -r1.4 configure.ac
*** src/sim/mips/configure.ac	26 May 2005 21:31:57 -0000	1.4
--- src/sim/mips/configure.ac	9 Jun 2005 16:49:05 -0000
*************** case "${target}" in
*** 145,162 ****
  			sim_igen_filter="32,64,f"
  			sim_m16_filter="16"
  			;;
!   mipsisa32r2*-*-*)	sim_gen=IGEN
! 		        sim_igen_machine="-M mips32r2"
  			sim_igen_filter="32,f"
  			sim_mach_default="mipsisa32r2"
  			;;
!   mipsisa32*-*-*)	sim_gen=IGEN
! 		        sim_igen_machine="-M mips32"
  			sim_igen_filter="32,f"
  			sim_mach_default="mipsisa32"
  			;;
!   mipsisa64r2*-*-*)	sim_gen=IGEN
! 		        sim_igen_machine="-M mips64r2,mips3d"
  			sim_igen_filter="32,64,f"
  			sim_mach_default="mipsisa64r2"
  			;;
--- 145,165 ----
  			sim_igen_filter="32,64,f"
  			sim_m16_filter="16"
  			;;
!   mipsisa32r2*-*-*)	sim_gen=M16
! 		        sim_igen_machine="-M mips32r2,mips16,mips16e"
! 			sim_m16_machine="-M mips16,mips16e,mips32"
  			sim_igen_filter="32,f"
  			sim_mach_default="mipsisa32r2"
  			;;
!   mipsisa32*-*-*)	sim_gen=M16
! 		        sim_igen_machine="-M mips32,mips16,mips16e"
! 			sim_m16_machine="-M mips16,mips16e,mips32r2"
  			sim_igen_filter="32,f"
  			sim_mach_default="mipsisa32"
  			;;
!   mipsisa64r2*-*-*)	sim_gen=M16
! 		        sim_igen_machine="-M mips64r2,mips3d,mips16,mips16e"
! 			sim_m16_machine="-M mips16,mips16e,mips64r2"
  			sim_igen_filter="32,64,f"
  			sim_mach_default="mipsisa64r2"
  			;;
*************** case "${target}" in
*** 165,172 ****
  			sim_igen_filter="32,64,f"
  			sim_mach_default="mips_sb1"
  			;;
!   mipsisa64*-*-*)	sim_gen=IGEN
! 		        sim_igen_machine="-M mips64,mips3d"
  			sim_igen_filter="32,64,f"
  			sim_mach_default="mipsisa64"
  			;;
--- 168,176 ----
  			sim_igen_filter="32,64,f"
  			sim_mach_default="mips_sb1"
  			;;
!   mipsisa64*-*-*)	sim_gen=M16
! 		        sim_igen_machine="-M mips64,mips3d,mips16,mips16e"
! 			sim_m16_machine="-M mips16,mips16e,mips64"
  			sim_igen_filter="32,64,f"
  			sim_mach_default="mipsisa64"
  			;;


Index: src/sim/mips/m16e.igen
===================================================================
// -*- C -*-

// Simulator definition for the MIPS16e instructions.
// Copyright (C) 2005 Free Software Foundation, Inc.
// Contributed by Nigel Stephens (nigel@mips.com) and 
//                David Ung (davidu@mips.com) of MIPS Technologies.
//
// This file is part of GDB, the GNU debugger.
// 
// 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, 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.


11101,3.RX,100,10001:RR:16::SEB
"seb r<TRX>"
*mips16e:
{
  TRACE_ALU_INPUT1 (GPR[TRX]);
  GPR[TRX] = EXTEND8 (GPR[TRX]);
  TRACE_ALU_RESULT (GPR[TRX]);
}


11101,3.RX,101,10001:RR:16::SEH
"seh r<TRX>"
*mips16e:
{
  TRACE_ALU_INPUT1 (GPR[TRX]);
  GPR[TRX] = EXTEND16 (GPR[TRX]);
  TRACE_ALU_RESULT (GPR[TRX]);
}

11101,3.RX,110,10001:RR:16::SEW
"sew r<TRX>"
*mips16e:
{
  check_u64 (SD_, instruction_0);
  TRACE_ALU_INPUT1 (GPR[TRX]);
  GPR[TRX] = EXTEND32 (GPR[TRX]);
  TRACE_ALU_RESULT (GPR[TRX]);
}

11101,3.RX,000,10001:RR:16::ZEB
"zeb r<TRX>"
*mips16e:
{
  TRACE_ALU_INPUT1 (GPR[TRX]);
  GPR[TRX] =  (unsigned_word)(unsigned8)(GPR[TRX]);
  TRACE_ALU_RESULT (GPR[TRX]);
}

11101,3.RX,001,10001:RR:16::ZEH
"zeh r<TRX>"
*mips16e:
{
  TRACE_ALU_INPUT1 (GPR[TRX]);
  GPR[TRX] = (unsigned_word)(unsigned16)(GPR[TRX]);
  TRACE_ALU_RESULT (GPR[TRX]);
}

11101,3.RX,010,10001:RR:16::ZEW
"zew r<TRX>"
*mips16e:
{
  check_u64 (SD_, instruction_0);
  TRACE_ALU_INPUT1 (GPR[TRX]);
  GPR[TRX] = (unsigned_word)(unsigned32)(GPR[TRX]);
  TRACE_ALU_RESULT (GPR[TRX]);
}


11101,3.RX,100,00000:RR:16::JRC
"jrc r<TRX>"
*mips16e:
{
  NIA = GPR[TRX];
}


11101,000,101,00000:RR:16::JRCRA
"jrc ra"
*mips16e:
{
  NIA = RA;
}


11101,3.RX,110,00000:RR:16::JALRC
"jalrc r<TRX>"
*mips16e:
{
  RA = NIA;
  NIA = GPR[TRX];
}

Re: [patch] MIPS16e support in simulator.

[David Ung]

> !   mipsisa32r2*-*-*)	sim_gen=M16
> ! 		        sim_igen_machine="-M mips32r2,mips16,mips16e"
> ! 			sim_m16_machine="-M mips16,mips16e,mips32"
>   			sim_igen_filter="32,f"
>   			sim_mach_default="mipsisa32r2"
>   			;;
> !   mipsisa32*-*-*)	sim_gen=M16
> ! 		        sim_igen_machine="-M mips32,mips16,mips16e"
> ! 			sim_m16_machine="-M mips16,mips16e,mips32r2"
>   			sim_igen_filter="32,f"
>   			sim_mach_default="mipsisa32"
>   			;;

Somehow I managed to screw up the sim_m16_machine lines as above.  :(
They should be the other way around of course.  :)

David.

Re: [patch] MIPS16e support in simulator.

[Daniel Jacobowitz]

On Thu, Jun 09, 2005 at 05:52:13PM +0100, David Ung wrote:
> 
> This patch adds MIPS16e support in the GNU simulator.  I've configure
> targets mipsisa32*-*-*, mipsisa32r2*-*-*, mipsisa64*-*-*,
> mipsisa64r2*-*-* to generate both normal and mips16e code.
> 
> David.
> 
> 2005-06-09  David Ung  <davidu@mips.com>
> 	    Nigel Stephens  <nigel@mips.com>
> 
> 	* mips.igen: New mips16e model and include m16e.igen.
> 	(check_u64): Add mips16e tag.
> 	* m16e.igen: New file for MIPS16e instructions.
> 	* configure.ac (mipsisa32*-*-*, mipsisa32r2*-*-*, mipsisa64*-*-*,
> 	mipsisa64r2*-*-*): Change sim_gen to M16, add mips16 and mips16e
> 	models.
> 	* configure: Regenerate.

So um... unfortunately, GDB does not have an active MIPS maintainer at
the moment.  I do not see anything (other than your followup about the
mipsisa32 configure stanza) obviously wrong with these changes, but I
can't provide any useful review of the mips-specific bits.  I don't
suppose someone on binutils@ could lend a hand?

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [patch] MIPS16e support in simulator.

[Eric Christopher]

> So um... unfortunately, GDB does not have an active MIPS maintainer at
> the moment.  I do not see anything (other than your followup about the
> mipsisa32 configure stanza) obviously wrong with these changes, but I
> can't provide any useful review of the mips-specific bits.  I don't
> suppose someone on binutils@ could lend a hand?
> 

I will, url to the original patch?

-eric

Re: [patch] MIPS16e support in simulator.

[Daniel Jacobowitz]

On Mon, Jun 13, 2005 at 10:02:45AM -0700, Eric Christopher wrote:
> 
> > So um... unfortunately, GDB does not have an active MIPS maintainer at
> > the moment.  I do not see anything (other than your followup about the
> > mipsisa32 configure stanza) obviously wrong with these changes, but I
> > can't provide any useful review of the mips-specific bits.  I don't
> > suppose someone on binutils@ could lend a hand?
> > 
> 
> I will, url to the original patch?

http://sourceware.org/ml/gdb-patches/2005-06/msg00078.html
http://sourceware.org/ml/gdb-patches/2005-06/msg00079.html

Thanks!

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [patch] MIPS16e support in simulator.

[Eric Christopher]

On Mon, 2005-06-13 at 13:03 -0400, Daniel Jacobowitz wrote:
> On Mon, Jun 13, 2005 at 10:02:45AM -0700, Eric Christopher wrote:
> > 
> > > So um... unfortunately, GDB does not have an active MIPS maintainer at
> > > the moment.  I do not see anything (other than your followup about the
> > > mipsisa32 configure stanza) obviously wrong with these changes, but I
> > > can't provide any useful review of the mips-specific bits.  I don't
> > > suppose someone on binutils@ could lend a hand?
> > > 
> > 
> > I will, url to the original patch?
> 
> http://sourceware.org/ml/gdb-patches/2005-06/msg00078.html
> http://sourceware.org/ml/gdb-patches/2005-06/msg00079.html

Looks like the jump instructions aren't executing the instructions in
the delay slot? See the definition of jalr in m16.igen.

I guess a good question would be asking how this patch was tested?

Otherwise it looks fine.

-eric

Re: [patch] MIPS16e support in simulator.

[David Ung]

On Mon, 2005-06-13 at 16:22 -0700, Eric Christopher wrote:
> On Mon, 2005-06-13 at 13:03 -0400, Daniel Jacobowitz wrote:
> > On Mon, Jun 13, 2005 at 10:02:45AM -0700, Eric Christopher wrote:
> > > 
> > > > So um... unfortunately, GDB does not have an active MIPS maintainer at
> > > > the moment.  I do not see anything (other than your followup about the
> > > > mipsisa32 configure stanza) obviously wrong with these changes, but I
> > > > can't provide any useful review of the mips-specific bits.  I don't
> > > > suppose someone on binutils@ could lend a hand?
> > > > 
> > > 
> > > I will, url to the original patch?
> > 
> > http://sourceware.org/ml/gdb-patches/2005-06/msg00078.html
> > http://sourceware.org/ml/gdb-patches/2005-06/msg00079.html
> 
> Looks like the jump instructions aren't executing the instructions in
> the delay slot? See the definition of jalr in m16.igen.

This is correct.  The MIPS16e jrc, jalrc etc does not have a delay slot.

> 
> I guess a good question would be asking how this patch was tested?
> 
> Otherwise it looks fine.

We've actually had MIPS16e simulator support for quite awhile at MIPS
for our internal use.  We've been doing nightly regressions test on
MIPS16e for gcc 3.4 and gdb for more that half year now.

David.

Re: [patch] MIPS16e support in simulator.

[Eric Christopher]

> > 
> > Looks like the jump instructions aren't executing the instructions in
> > the delay slot? See the definition of jalr in m16.igen.
> 
> This is correct.  The MIPS16e jrc, jalrc etc does not have a delay slot.
> 

OK. The docs I have don't call this out explicitly in the instruction
description and probably should given that other mips (and mips16)
instructions have delay slots.

> > 
> > I guess a good question would be asking how this patch was tested?
> > 
> > Otherwise it looks fine.
> 
> We've actually had MIPS16e simulator support for quite awhile at MIPS
> for our internal use.  We've been doing nightly regressions test on
> MIPS16e for gcc 3.4 and gdb for more that half year now.

You should say that sort of thing when you submit patches, e.g.:

"Tested on mips-elf using internal mips16e port. No regressions."

or some such.

-eric

Re: [patch] MIPS16e support in simulator.

[Maciej W. Rozycki]

On Tue, 14 Jun 2005, Eric Christopher wrote:

> > This is correct.  The MIPS16e jrc, jalrc etc does not have a delay slot.
> > 
> 
> OK. The docs I have don't call this out explicitly in the instruction
> description and probably should given that other mips (and mips16)
> instructions have delay slots.

 Perhaps you have wrong docs? ;-)  Vol. IV-a of the MIPS32 ISA document 
set (downloadable from the web site) is quite explicit on that in the 
detailed instruction descriptions -- see "Programming Notes" for the 
relevant ones.

  Maciej

Re: [patch] MIPS16e support in simulator.

[Eric Christopher]

>  Perhaps you have wrong docs? ;-)  Vol. IV-a of the MIPS32 ISA document 
> set (downloadable from the web site) is quite explicit on that in the 
> detailed instruction descriptions -- see "Programming Notes" for the 
> relevant ones.

Hey, yup, there it is. Right there at the bottom of the page.


-eric

Re: [patch] MIPS16e support in simulator.

[Daniel Jacobowitz]

On Mon, Jun 13, 2005 at 04:22:36PM -0700, Eric Christopher wrote:
> On Mon, 2005-06-13 at 13:03 -0400, Daniel Jacobowitz wrote:
> > On Mon, Jun 13, 2005 at 10:02:45AM -0700, Eric Christopher wrote:
> > > 
> > > > So um... unfortunately, GDB does not have an active MIPS maintainer at
> > > > the moment.  I do not see anything (other than your followup about the
> > > > mipsisa32 configure stanza) obviously wrong with these changes, but I
> > > > can't provide any useful review of the mips-specific bits.  I don't
> > > > suppose someone on binutils@ could lend a hand?
> > > > 
> > > 
> > > I will, url to the original patch?
> > 
> > http://sourceware.org/ml/gdb-patches/2005-06/msg00078.html
> > http://sourceware.org/ml/gdb-patches/2005-06/msg00079.html
> 
> Looks like the jump instructions aren't executing the instructions in
> the delay slot? See the definition of jalr in m16.igen.
> 
> I guess a good question would be asking how this patch was tested?
> 
> Otherwise it looks fine.

Given this, and the followups, the patch is OK.  It looks like David
doesn't have commit access; is that right?  Let me know and I'll take
care of the patch.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [patch] MIPS16e support in simulator.

[David Ung]

On Tue, 2005-06-14 at 13:48 -0400, Daniel Jacobowitz wrote:
> On Mon, Jun 13, 2005 at 04:22:36PM -0700, Eric Christopher wrote:
> > On Mon, 2005-06-13 at 13:03 -0400, Daniel Jacobowitz wrote:
> > > On Mon, Jun 13, 2005 at 10:02:45AM -0700, Eric Christopher wrote:
> > > > 
> > > > > So um... unfortunately, GDB does not have an active MIPS maintainer at
> > > > > the moment.  I do not see anything (other than your followup about the
> > > > > mipsisa32 configure stanza) obviously wrong with these changes, but I
> > > > > can't provide any useful review of the mips-specific bits.  I don't
> > > > > suppose someone on binutils@ could lend a hand?
> > > > > 
> > > > 
> > > > I will, url to the original patch?
> > > 
> > > http://sourceware.org/ml/gdb-patches/2005-06/msg00078.html
> > > http://sourceware.org/ml/gdb-patches/2005-06/msg00079.html
> > 
> > Looks like the jump instructions aren't executing the instructions in
> > the delay slot? See the definition of jalr in m16.igen.
> > 
> > I guess a good question would be asking how this patch was tested?
> > 
> > Otherwise it looks fine.
> 
> Given this, and the followups, the patch is OK.  It looks like David
> doesn't have commit access; is that right?  Let me know and I'll take
> care of the patch.

no, I don't have write access.  Could you commit it please.

David.

Re: [patch] MIPS16e support in simulator.

[Andrew Cagney]

David Ung wrote:
> This patch adds MIPS16e support in the GNU simulator.  I've configure
> targets mipsisa32*-*-*, mipsisa32r2*-*-*, mipsisa64*-*-*,
> mipsisa64r2*-*-* to generate both normal and mips16e code.

sure, check it in (and thanks for putting the new stuff in a new file) 
(i'll get the account organized)

Re: [patch] MIPS16e support in simulator.

[David Ung]

On Wed, 2005-06-15 at 10:56 -0400, Andrew Cagney wrote:
> David Ung wrote:
> > This patch adds MIPS16e support in the GNU simulator.  I've configure
> > targets mipsisa32*-*-*, mipsisa32r2*-*-*, mipsisa64*-*-*,
> > mipsisa64r2*-*-* to generate both normal and mips16e code.
> 
> sure, check it in (and thanks for putting the new stuff in a new file) 
> (i'll get the account organized)
> 

committed to CVS.

David.