2013-06-12 Sandra Loosemore <sandra@codesourcery.com>

	include/opcode/
	* nios2.h (OP_MATCH_ERET): Correct eret encoding.

	gas/testsuite/
	* gas/nios2/tret.d: Correct eret encoding.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index ec9aff7..b38bb43 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-12  Sandra Loosemore  <sandra@codesourcery.com>
+
+       * gas/nios2/tret.d: Correct eret encoding.
+
 2013-06-10  Maciej W. Rozycki  <macro@codesourcery.com>
 
        * gas/mips/relax-bc1any.l: New test.

diff --git a/gas/testsuite/gas/nios2/tret.d b/gas/testsuite/gas/nios2/tret.d
index c6fc003..09bb09a 100644 (file)
--- a/gas/testsuite/gas/nios2/tret.d
+++ b/gas/testsuite/gas/nios2/tret.d
@@ -4,5 +4,4 @@
 .*: +file format elf32-littlenios2
 
 Disassembly of section .text:
-0+0000 <[^>]*> e800083a        eret
-
+0+0000 <[^>]*> ef80083a        eret

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 7ed2c68..ecf4b11 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-12  Sandra Loosemore  <sandra@codesourcery.com>
+
+       * nios2.h (OP_MATCH_ERET): Correct eret encoding.
+
 2013-05-22  Jürgen Urban  <JuergenUrban@gmx.de>
 
        * mips.h (M_LQC2_AB, M_SQC2_AB): New macros.

diff --git a/include/opcode/nios2.h b/include/opcode/nios2.h
index 5f6cf6e..aa67098 100644 (file)
--- a/include/opcode/nios2.h
+++ b/include/opcode/nios2.h
@@ -440,7 +440,7 @@ struct nios2_reg
 #define OP_MATCH_SUB           OPX_MATCH (OPX_SUB)
 #define OP_MATCH_SYNC          OPX_MATCH (OPX_SYNC)
 #define OP_MATCH_TRAP          ((0x1d << 17) | OPX_MATCH (OPX_TRAP))
-#define OP_MATCH_ERET          (0xe8000000 | OPX_MATCH (OPX_ERET))
+#define OP_MATCH_ERET          (0xef800000 | OPX_MATCH (OPX_ERET))
 #define OP_MATCH_WRCTL         OPX_MATCH (OPX_WRCTL)
 #define OP_MATCH_WRPRS         OPX_MATCH (OPX_WRPRS)
 #define OP_MATCH_XOR           OPX_MATCH (OPX_XOR)