2010-05-26 Catherine Moore <clm@codesourcery.com>

            David Ung  <davidu@mips.com>

        * mips-opc.c: Change membership to I1 for instructions ssnop and
        ehb.

2010-05-26  Catherine Moore  <clm@codesoucery.com>
            Maxim Kuvyrkov  <maxim@codesourcery.com>

        * gas/mips/set-arch.d: Expect ehb.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 8620bf6..d8bbb30 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,4 +1,9 @@
 2010-05-26  Catherine Moore  <clm@codesoucery.com>
+           Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+       * gas/mips/set-arch.d: Expect ehb.
+
+2010-05-26  Catherine Moore  <clm@codesoucery.com>
 
        * gas/mips/mips-no-jalx.l: Delete.
        * gas/mips/mips-no-jalx.s: Delete.

diff --git a/gas/testsuite/gas/mips/set-arch.d b/gas/testsuite/gas/mips/set-arch.d
index 7639adb..8ef72cc 100644 (file)
--- a/gas/testsuite/gas/mips/set-arch.d
+++ b/gas/testsuite/gas/mips/set-arch.d
@@ -165,7 +165,7 @@ Disassembly of section \.text:
 00000274 <[^>]*> 7000003f      sdbbp
 00000278 <[^>]*> 7000003f      sdbbp
 0000027c <[^>]*> 7159e27f      sdbbp   0x56789
-00000280 <[^>]*> 000000c0      sll     zero,zero,0x3
+00000280 <[^>]*> 000000c0      ehb
 00000284 <[^>]*> 7ca43980      0x7ca43980
 00000288 <[^>]*> 7ca46984      0x7ca46984
 0000028c <[^>]*> 0100fc09      jalr.hb t0

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index fe7557e..3b48b75 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-26  Catherine Moore <clm@codesourcery.com>
+           David Ung  <davidu@mips.com>
+
+       * mips-opc.c: Change membership to I1 for instructions ssnop and
+       ehb.
+
 2010-05-26  H.J. Lu  <hongjiu.lu@intel.com>
 
        * i386-dis.c (sib): New.

diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
index fafcb12..f276a00 100644 (file)
--- a/opcodes/mips-opc.c
+++ b/opcodes/mips-opc.c
@@ -185,8 +185,8 @@ const struct mips_opcode mips_builtin_opcodes[] =
 {"pref",    "k,o(b)",   0xcc000000, 0xfc000000, RD_b,                  0,              I4_32|G3        },
 {"prefx",   "h,t(b)",  0x4c00000f, 0xfc0007ff, RD_b|RD_t|FP_S,         0,              I4_33   },
 {"nop",     "",         0x00000000, 0xffffffff, 0,                     INSN2_ALIAS,    I1      }, /* sll */
-{"ssnop",   "",         0x00000040, 0xffffffff, 0,                     INSN2_ALIAS,    I32|N55 }, /* sll */
-{"ehb",     "",         0x000000c0, 0xffffffff, 0,                     INSN2_ALIAS,    I33     }, /* sll */
+{"ssnop",   "",         0x00000040, 0xffffffff, 0,                     INSN2_ALIAS,    I1      }, /* sll */
+{"ehb",     "",         0x000000c0, 0xffffffff, 0,                     INSN2_ALIAS,    I1      }, /* sll */
 {"li",      "t,j",      0x24000000, 0xffe00000, WR_t,                  INSN2_ALIAS,    I1      }, /* addiu */
 {"li",     "t,i",      0x34000000, 0xffe00000, WR_t,                   INSN2_ALIAS,    I1      }, /* ori */
 {"li",      "t,I",     0,    (int) M_LI,       INSN_MACRO,             0,              I1      },