opcodes/

	* mips16-opc.c: Add entries for argumentless "entry" and "exit"
	instructions.

gas/testsuite/
	* gas/mips/mips16.d, gas/mips/mips16-64.d: Remove trailing whitespace
	from ENTRY and EXIT lines.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index e918828..459aafe 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2013-07-07  Richard Sandiford  <rdsandiford@googlemail.com>
 
+       * gas/mips/mips16.d, gas/mips/mips16-64.d: Remove trailing whitespace
+       from ENTRY and EXIT lines.
+
+2013-07-07  Richard Sandiford  <rdsandiford@googlemail.com>
+
        * gas/mips/vr5400-ill.s, gas/mips/vr5400-ill.l: New test.
        * gas/mips/mips.exp: Run it.
 

diff --git a/gas/testsuite/gas/mips/mips16-64.d b/gas/testsuite/gas/mips/mips16-64.d
index 3d04ecc..95d7001 100644 (file)
--- a/gas/testsuite/gas/mips/mips16-64.d
+++ b/gas/testsuite/gas/mips/mips16-64.d
@@ -670,12 +670,12 @@ Disassembly of section .text:
                        84c: R_MIPS_NONE        \*ABS\*
                        84c: R_MIPS_NONE        \*ABS\*
  850:  6500            nop
- 852:  e809            entry   
+ 852:  e809            entry
  854:  e909            entry   a0
  856:  eb49            entry   a0-a2,s0
  858:  e8a9            entry   s0-s1,ra
  85a:  e829            entry   ra
- 85c:  ef09            exit    
+ 85c:  ef09            exit
  85e:  ef49            exit    s0
  860:  efa9            exit    s0-s1,ra
  862:  ef29            exit    ra

diff --git a/gas/testsuite/gas/mips/mips16.d b/gas/testsuite/gas/mips/mips16.d
index 7169d69..b2cc9ae 100644 (file)
--- a/gas/testsuite/gas/mips/mips16.d
+++ b/gas/testsuite/gas/mips/mips16.d
@@ -667,12 +667,12 @@ Disassembly of section .text:
  84c:  1800 0000       jal     0 <data1>
                        84c: R_MIPS16_26        extern
  850:  6500            nop
- 852:  e809            entry   
+ 852:  e809            entry
  854:  e909            entry   a0
  856:  eb49            entry   a0-a2,s0
  858:  e8a9            entry   s0-s1,ra
  85a:  e829            entry   ra
- 85c:  ef09            exit    
+ 85c:  ef09            exit
  85e:  ef49            exit    s0
  860:  efa9            exit    s0-s1,ra
  862:  ef29            exit    ra

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d364ce8..fe6a543 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,10 @@
 2013-07-07  Richard Sandiford  <rdsandiford@googlemail.com>
 
+       * mips16-opc.c: Add entries for argumentless "entry" and "exit"
+       instructions.
+
+2013-07-07  Richard Sandiford  <rdsandiford@googlemail.com>
+
        * mips-opc.c (mips_builtin_opcodes): Use "Q" for the INSN_5400
        MDMX-like instructions.
        * mips-dis.c (print_insn_arg): Use "$f" rather than "$v" when

diff --git a/opcodes/mips16-opc.c b/opcodes/mips16-opc.c
index d90c7f3..357fcc1 100644 (file)
--- a/opcodes/mips16-opc.c
+++ b/opcodes/mips16-opc.c
@@ -159,7 +159,9 @@ const struct mips_opcode mips16_opcodes[] =
 {"dsubu",   "y,j",     0, (int) M_DSUBU_I_2, INSN_MACRO, 0,    I1 },
 {"exit",    "L",       0xed09, 0xff1f, TRAP,           0,      I1 },
 {"exit",    "L",       0xee09, 0xff1f, TRAP,           0,      I1 },
+{"exit",    "",                0xef09, 0xffff, TRAP,           0,      I1 },
 {"exit",    "L",       0xef09, 0xff1f, TRAP,           0,      I1 },
+{"entry",   "",                0xe809, 0xffff, TRAP,           0,      I1 },
 {"entry",   "l",       0xe809, 0xf81f, TRAP,           0,      I1 },
 {"extend",  "e",       0xf000, 0xf800, 0,              0,      I1 },
 {"jalr",    "x",       0xe840, 0xf8ff, UBD|WR_31|RD_x, 0,      I1 },