gas/

	* config/tc-ppc.c (ppc_setup_opcodes): Verify instructions are sorted
	according to major opcode number.

opcodes/

	* ppc-opc.c (TE): Correct signedness.
	(powerpc_opcodes): Sort psq_st and psq_stu according to major
	opcode number.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 407db4416ec11fcd6fd5f70f06265166daa85850..8cf8f04f985f6cb62bc8335ea2a4e1697472a2ac 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-15  Peter Bergner  <bergner@vnet.ibm.com>
+
+       * config/tc-ppc.c (ppc_setup_opcodes): Verify instructions are sorted
+       according to major opcode number.
+
 2007-10-15  Alan Modra  <amodra@bigpond.net.au>
 
        * read.c (do_s_func): Check asprintf return status.

diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 868258f7c38689d4742e34720a2746c3074f76f3..fc8b9a07cc67683f66e61ba264641fc312517920 100644 (file)
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -1249,6 +1249,7 @@ ppc_setup_opcodes (void)
   const struct powerpc_macro *macro;
   const struct powerpc_macro *macro_end;
   bfd_boolean bad_insn = FALSE;
+  unsigned long prev_opcode = 0;
 
   if (ppc_hash != NULL)
     hash_die (ppc_hash);
@@ -1296,6 +1297,17 @@ ppc_setup_opcodes (void)
        {
          const unsigned char *o;
          unsigned long omask = op->mask;
+         unsigned long major_opcode = PPC_OP (op->opcode);
+
+         /* The major opcodes had better be sorted.  Code in the disassembler
+            assumes the insns are sorted according to major opcode.  */
+         if (major_opcode < prev_opcode)
+           {
+             as_bad (_("major opcode is not sorted for %s"),
+                     op->name);
+             bad_insn = TRUE;
+           }
+         prev_opcode = major_opcode;
 
          /* The mask had better not trim off opcode bits.  */
          if ((op->opcode & omask) != op->opcode)

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index a611ea05a07526e791f0da1cf8d6d7e97548876c..a73c99b5d6b76e0a45403f0e1aea26b7fba8e3e0 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-15  Peter Bergner  <bergner@vnet.ibm.com>
+
+       * ppc-opc.c (TE): Correct signedness.
+       (powerpc_opcodes): Sort psq_st and psq_stu according to major
+       opcode number.
+
 2007-10-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        * i386-dis.c (dis386_twobyte): Reformat.

diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
index 8dbfad33ca952e21ebab20c1ac85fa39c76ef019..ad30fc5f515c79974054574365b3dfd03ae24fc2 100644 (file)
--- a/opcodes/ppc-opc.c
+++ b/opcodes/ppc-opc.c
@@ -492,13 +492,13 @@ const struct powerpc_operand powerpc_operands[] =
 #define VS VD
   { 0x1f, 21, NULL, NULL, PPC_OPERAND_VR },
 
-  /* The SIMM field in a VX form instruction.  */
+  /* The SIMM field in a VX form instruction, and TE in Z form.  */
 #define SIMM VD + 1
+#define TE SIMM
   { 0x1f, 16, NULL, NULL, PPC_OPERAND_SIGNED},
 
-  /* The UIMM field in a VX form instruction, and TE in Z form.  */
+  /* The UIMM field in a VX form instruction.  */
 #define UIMM SIMM + 1
-#define TE UIMM
   { 0x1f, 16, NULL, NULL, 0 },
 
   /* The SHB field in a VA form instruction.  */
@@ -4495,9 +4495,6 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "fnmadds", A(59,31,0), A_MASK,       PPC,            { FRT,FRA,FRC,FRB } },
 { "fnmadds.",A(59,31,1), A_MASK,       PPC,            { FRT,FRA,FRC,FRB } },
 
-{ "psq_st",  OP(60),    OP_MASK,        PPCPS,          { FRS, PSD, RA, PSW, PSQ } },
-{ "psq_stu", OP(61),    OP_MASK,        PPCPS,          { FRS, PSD, RA, PSW, PSQ } },
-
 { "dmul",    XRC(59,34,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
 { "dmul.",   XRC(59,34,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
 
@@ -4561,6 +4558,9 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "stfq",    OP(60),   OP_MASK,        POWER2,         { FRS, D, RA } },
 
+{ "psq_st",  OP(60),    OP_MASK,        PPCPS,          { FRS, PSD, RA, PSW, PSQ } },
+{ "psq_stu", OP(61),    OP_MASK,        PPCPS,          { FRS, PSD, RA, PSW, PSQ } },
+
 { "stfqu",   OP(61),   OP_MASK,        POWER2,         { FRS, D, RA } },
 
 { "stfdp",   OP(61),   OP_MASK,        POWER6,         { FRT, D, RA0 } },