summaryrefslogtreecommitdiff
path: root/opcodes
diff options
context:
space:
mode:
authorSandra Loosemore <sandra@codesourcery.com>2013-06-10 01:04:42 +0000
committerSandra Loosemore <sandra@codesourcery.com>2013-06-10 01:04:42 +0000
commitf9fc1b3483bda6571d98f76a2e00458cb66e9606 (patch)
tree9d496a936cc8a25315a468b1e0485ca49f611a6e /opcodes
parentf8d8ad17d840a8364db2477ccd27279bddc92a27 (diff)
downloadbinutils-redhat-f9fc1b3483bda6571d98f76a2e00458cb66e9606.tar.gz
2013-06-09 Sandra Loosemore <sandra@codesourcery.com>
opcodes/ * nios2-opc.c (nios2_builtin_opcodes): Give "trap" a type-"b" argument. gas/ * config/tc-nios2.c (nios2_parse_args): Allow trap argument to omitted. gas/testsuite/ * gas/nios2/trap.s: Add additional test cases for optional argument. * gas/nios2/trap.d: Likewise.
Diffstat (limited to 'opcodes')
-rw-r--r--opcodes/ChangeLog5
-rw-r--r--opcodes/nios2-opc.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 35ce609b25..2f053850bd 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-09 Sandra Loosemore <sandra@codesourcery.com>
+
+ * nios2-opc.c (nios2_builtin_opcodes): Give "trap" a type-"b"
+ argument.
+
2013-06-08 Catherine Moore <clm@codesourcery.com>
Richard Sandiford <rdsandiford@googlemail.com>
diff --git a/opcodes/nios2-opc.c b/opcodes/nios2-opc.c
index b2734bd91e..83cf1898af 100644
--- a/opcodes/nios2-opc.c
+++ b/opcodes/nios2-opc.c
@@ -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},