Fix undefined weak symbol reloc tests

[platform/upstream/binutils.git] / opcodes / nios2-opc.c

diff --git a/opcodes/nios2-opc.c b/opcodes/nios2-opc.c
index ff24652..47a7ee4 100644 (file)
--- a/opcodes/nios2-opc.c
+++ b/opcodes/nios2-opc.c
@@ -1,5 +1,5 @@
 /* Altera Nios II opcode list.
-   Copyright (C) 2012, 2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
    Contributed by Nigel Gray (ngray@altera.com).
    Contributed by Mentor Graphics, Inc.
 
@@ -58,7 +58,7 @@ const struct nios2_reg nios2_builtin_regs[] = {
   {"sp", 27},                  /* stack pointer */
   {"fp", 28},                  /* frame pointer */
   {"ea", 29},                  /* exception return address */
-  {"ba", 30},                  /* breakpoint return address */
+  {"sstatus", 30},             /* saved processor status */
   {"ra", 31},                  /* return address */
 
   /* Alternative names for special registers.  */
@@ -71,7 +71,7 @@ const struct nios2_reg nios2_builtin_regs[] = {
   {"r28", 28},
   {"r29", 29},
   {"r30", 30},
-  {"sstatus", 30},
+  {"ba", 30},                  /* breakpoint return address */
   {"r31", 31},
 
   /* Control register names.  */
@@ -86,7 +86,7 @@ const struct nios2_reg nios2_builtin_regs[] = {
   {"pteaddr", 8},
   {"tlbacc", 9},
   {"tlbmisc", 10},
-  {"fstatus", 11},
+  {"eccinj", 11},
   {"badaddr", 12},
   {"config", 13},
   {"mpubase", 14},
@@ -345,6 +345,8 @@ const struct nios2_opcode nios2_builtin_opcodes[] =
    OP_MATCH_ORI, OP_MASK_IOP, NIOS2_INSN_ORI, unsigned_immed16_overflow},
   {"rdctl", "d,c", "d,c,E", 2,
    OP_MATCH_RDCTL, OP_MASK_RDCTL, 0, no_overflow},
+  {"rdprs", "t,s,i", "t,s,i,E", 3,
+   OP_MATCH_RDPRS, OP_MASK_IOP, 0, unsigned_immed16_overflow},
   {"ret", "", "E", 0,
    OP_MATCH_RET, OP_MASK, 0, no_overflow},
   {"rol", "d,s,t", "d,s,t,E", 3,
@@ -383,7 +385,7 @@ const struct nios2_opcode nios2_builtin_opcodes[] =
    OP_MATCH_SUB, OP_MASK_ROPX | OP_MASK_ROP, 0, no_overflow},
   {"sync", "", "E", 0,
    OP_MATCH_SYNC, OP_MASK_SYNC, 0, no_overflow},
-  {"trap", "", "E", 0,
+  {"trap", "b", "b,E", 1,
    OP_MATCH_TRAP, OP_MASK_TRAP, 0, no_overflow},
   {"eret", "", "E", 0,
    OP_MATCH_ERET, OP_MASK, 0, no_overflow},
@@ -391,6 +393,8 @@ const struct nios2_opcode nios2_builtin_opcodes[] =
    OP_MATCH_CUSTOM, OP_MASK_ROP, 0, custom_opcode_overflow},
   {"wrctl", "c,s", "c,s,E", 2,
    OP_MATCH_WRCTL, OP_MASK_WRCTL, 0, no_overflow},
+  {"wrprs", "d,s", "d,s,E", 2,
+   OP_MATCH_WRPRS, OP_MASK_RRT|OP_MASK_ROPX|OP_MASK_ROP, 0, no_overflow},
   {"xor", "d,s,t", "d,s,t,E", 3,
    OP_MATCH_XOR, OP_MASK_ROPX | OP_MASK_ROP, 0, no_overflow},
   {"xorhi", "t,s,u", "t,s,u,E", 3,