[MIPS PATCH] sort c.lt.s and c.le.s back into the correct order

[MIPS PATCH] sort c.lt.s and c.le.s back into the correct order

[cgd]

Below's a patch to re-order a couple of entries in the MIPS opcode
table.  I think it's an obvious fix, but it's sufficiently odd that
i'll wait until Monday to check it in.

It's odd in the sense that the change to move the c.lt.s and c.le.s
opcodes was made (at least somewhat intentionally) in the change:

> revision 1.2
> date: 1999/11/11 11:38:41;  author: nickc;  state: Exp;  lines: +38 -34
> Add ssnop pattern.

That patch actually made a bunch of changes in the direction of adding
support for the (now-renamed) "M1" ISA, in addition to what was noted
in the ChangeLog & commit message.

I can't see or even think of any reason why it was "The Right Thing"
to move these particular opcodes out of the order used to sort the
rest of the entries around there.  (The c.comparison.format opcodes
are generally sorted by the code in the low 6 bits, then secondarily
in the order d, s, ps.)

So, unless somebody screams, i'm going to move re-sort them.  8-)


chris
====
Index: mips-opc.c
===================================================================
RCS file: /cvs/src/src/opcodes/mips-opc.c,v
retrieving revision 1.22
diff -c -r1.22 mips-opc.c
*** mips-opc.c	2001/06/22 21:10:01	1.22
--- mips-opc.c	2001/07/21 03:26:03
***************
*** 252,259 ****
  {"c.ueq.s", "M,S,T",    0x46000033, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S,   I4|I32	},
  {"c.ueq.ps","S,T",	0x46c00033, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_D,	I5	},
  {"c.ueq.ps","M,S,T",	0x46c00033, 0xffe000ff,	RD_S|RD_T|WR_CC|FP_D,	I5	},
- {"c.lt.s",  "S,T",	0x4600003c, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_S,	I1	},
- {"c.lt.s",  "M,S,T",    0x4600003c, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S,   I4|I32	},
  {"c.olt.d", "S,T",      0x46200034, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D,   I1      },
  {"c.olt.d", "M,S,T",    0x46200034, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D,   I4|I32	},
  {"c.olt.s", "S,T",	0x46000034, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_S,	I1	},
--- 252,257 ----
***************
*** 266,273 ****
  {"c.ult.s", "M,S,T",    0x46000035, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S,   I4|I32	},
  {"c.ult.ps","S,T",	0x46c00035, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_D,	I5	},
  {"c.ult.ps","M,S,T",	0x46c00035, 0xffe000ff,	RD_S|RD_T|WR_CC|FP_D,	I5	},
- {"c.le.s",  "S,T",	0x4600003e, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_S,	I1	},
- {"c.le.s",  "M,S,T",    0x4600003e, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S,   I4|I32	},
  {"c.ole.d", "S,T",      0x46200036, 0xffe007ff, RD_S|RD_T|WR_CC|FP_D,   I1      },
  {"c.ole.d", "M,S,T",    0x46200036, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D,   I4|I32	},
  {"c.ole.s", "S,T",      0x46000036, 0xffe007ff, RD_S|RD_T|WR_CC|FP_S,   I1      },
--- 264,269 ----
***************
*** 306,311 ****
--- 302,309 ----
  {"c.ngl.ps","M,S,T",	0x46c0003b, 0xffe000ff,	RD_S|RD_T|WR_CC|FP_D,	I5	},
  {"c.lt.d",  "S,T",	0x4620003c, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_D,	I1	},
  {"c.lt.d",  "M,S,T",    0x4620003c, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D,   I4|I32	},
+ {"c.lt.s",  "S,T",	0x4600003c, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_S,	I1	},
+ {"c.lt.s",  "M,S,T",    0x4600003c, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S,   I4|I32	},
  {"c.lt.ps", "S,T",	0x46c0003c, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_D,	I5	},
  {"c.lt.ps", "M,S,T",	0x46c0003c, 0xffe000ff,	RD_S|RD_T|WR_CC|FP_D,	I5	},
  {"c.nge.d", "S,T",	0x4620003d, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_D,	I1	},
***************
*** 316,321 ****
--- 314,321 ----
  {"c.nge.ps","M,S,T",	0x46c0003d, 0xffe000ff,	RD_S|RD_T|WR_CC|FP_D,	I5	},
  {"c.le.d",  "S,T",	0x4620003e, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_D,	I1	},
  {"c.le.d",  "M,S,T",    0x4620003e, 0xffe000ff, RD_S|RD_T|WR_CC|FP_D,   I4|I32	},
+ {"c.le.s",  "S,T",	0x4600003e, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_S,	I1	},
+ {"c.le.s",  "M,S,T",    0x4600003e, 0xffe000ff, RD_S|RD_T|WR_CC|FP_S,   I4|I32	},
  {"c.le.ps", "S,T",	0x46c0003e, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_D,	I5	},
  {"c.le.ps", "M,S,T",	0x46c0003e, 0xffe000ff,	RD_S|RD_T|WR_CC|FP_D,	I5	},
  {"c.ngt.d", "S,T",	0x4620003f, 0xffe007ff,	RD_S|RD_T|WR_CC|FP_D,	I1	},

Re: [MIPS PATCH] sort c.lt.s and c.le.s back into the correct order

[Eric Christopher]

> So, unless somebody screams, i'm going to move re-sort them.  8-)

Approved.  No one's told me why they were out of order either ;)

Don't forget the ChangeLog.

-eric

-- 
Look out behind you!

Re: [MIPS PATCH] sort c.lt.s and c.le.s back into the correctorder

[cgd]

"Eric Christopher" <echristo@redhat.com> writes:
> > So, unless somebody screams, i'm going to move re-sort them.  8-)
> 
> Approved.  No one's told me why they were out of order either ;)
> 
> Don't forget the ChangeLog.

Boy, it's been a while, hasn't it...

Checked in, with ChangeLog entry:

2001-07-21  Chris Demetriou  <cgd@broadcom.com>

      * mips-opc.c (mips_builtin_opcodes): Sort c.le.s and c.lt.s
      into the rest of the surrounding definitions.


cgd