X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fnios2-opc.c;h=47a7ee46c09b98d90618d220595f7c69ad32d2e9;hb=173373c6f6388171d1d62a217fae90a052395be2;hp=41903d06bdc11d951e3a994018173898bbe94e2f;hpb=dad60f8e13c64b699e34d437c1c02b87ae158380;p=deliverable%2Fbinutils-gdb.git

diff --git a/opcodes/nios2-opc.c b/opcodes/nios2-opc.c
index 41903d06bd..47a7ee46c0 100644
--- 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},
@@ -385,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},