darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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.
This commit is contained in:
Sandra Loosemore 2013-06-10 01:04:42 +00:00
parent a7cfa99ecf
commit 9daf7bab4f
7 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gas/ChangeLog
View file

@ -1,3 +1,8 @@
2013-06-09 Sandra Loosemore <sandra@codesourcery.com>
* config/tc-nios2.c (nios2_parse_args): Allow trap argument to
omitted.
2013-06-08 Catherine Moore <clm@codesourcery.com>
* config/tc-mips.c (is_opcode_valid): Build ASE mask.

6
gas/config/tc-nios2.c
View file

@ -2078,7 +2078,11 @@ nios2_parse_args (nios2_insn_infoS *insn, char *argstr,
parsed_args[i] = NULL;
if (*parsestr != '\0' && insn->insn_nios2_opcode->match != OP_MATCH_BREAK)
/* The argument to break and trap instructions is optional; complain
for other cases of missing arguments. */
if (*parsestr != '\0'
&& insn->insn_nios2_opcode->match != OP_MATCH_BREAK
&& insn->insn_nios2_opcode->match != OP_MATCH_TRAP)
as_bad (_("missing argument"));
}

6
gas/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2013-06-09 Sandra Loosemore <sandra@codesourcery.com>
* gas/nios2/trap.s: Add additional test cases for optional
argument.
* gas/nios2/trap.d: Likewise.
2013-05-31 H.J. Lu <hongjiu.lu@intel.com>
* gas/i386/size-3.d: Updated for text/data/bss section alignment

5
gas/testsuite/gas/nios2/trap.d
View file

@ -4,4 +4,7 @@
.*: +file format elf32-littlenios2
Disassembly of section .text:
0+0000 <[^>]*> 003b683a trap
0+0000 <[^>]*> 003b683a trap 0
0+0004 <[^>]*> 003b683a trap 0
0+0008 <[^>]*> 003b6ffa trap 31
0+000c <[^>]*> 003b6bba trap 14

5
gas/testsuite/gas/nios2/trap.s
View file

@ -1,3 +1,6 @@
# Source file used to test the ret instructions
# Source file used to test the trap instructions
foo:
trap
trap 0
trap 31
trap 14

5
opcodes/ChangeLog
View file

@ -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>

2
opcodes/nios2-opc.c
View file

@ -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},