MIPS16: Switch to 32-bit opcode table interpretation
authorMaciej W. Rozycki <macro@imgtec.com>
Tue, 20 Dec 2016 02:03:40 +0000 (02:03 +0000)
committerMaciej W. Rozycki <macro@imgtec.com>
Tue, 20 Dec 2016 11:56:32 +0000 (11:56 +0000)
commit7fd5392005624f8b0522d881aa94bbb470d68cd7
tree680a9185f2e3f2c781b08b445357561cffc94077
parent4ebce1a0a5911e71aa2d00932ffb2126ff1f3633
MIPS16: Switch to 32-bit opcode table interpretation

Switch to 32-bit MIPS16 opcode table entry interpretation, similar to
how the microMIPS opcode table is handled, for both the `match' and
`mask' fields, removing special casing for JAL and JALX instructions and
their `a' and `i' operand codes throughout, while retaining automatic
processing of extendable opcodes in assembly and disassembly.

In assembly disallow size enforcement suffixes as appropriate: `.t' for
both 32-bit instructions and macros and `.e' for macros only, making
macro handling consistent with the microMIPS instruction set.

In disassembly fully decode EXTEND prefixes prepended to unsupported
instruction encodings (according to the ISA selection) rather than
dumping them as hexadecimal data along with the following instruction,
removing all special casing for the EXTEND prefix and making its
handling rely on its opcode table entry, except where it is considered a
part of an extendable instruction.

include/
* opcode/mips.h (mips_opcode_32bit_p): New inline function.

gas/
* config/tc-mips.c (micromips_insn_length): Use
`mips_opcode_32bit_p'.
(is_size_valid): Adjust description.
(is_size_valid_16): New function.
(validate_mips_insn): Use `mips_opcode_32bit_p' in MIPS16
operand decoding.
(validate_mips16_insn): Remove `a' and `i' operand code special
casing, use `mips_opcode_32bit_p' to determine instruction
width.
(append_insn): Adjust forced MIPS16 instruction size
determination.
(match_mips16_insn): Likewise.  Don't shift the instruction's
opcode with the `a' and `i' operand codes.  Use
`mips_opcode_32bit_p' in operand decoding.
(match_mips16_insns): Check for forced instruction size's
validity.
(mips16_ip): Don't force instruction size in the `noautoextend'
mode.
* testsuite/gas/mips/mips16-jal-e.d: New test.
* testsuite/gas/mips/mips16-jal-t.d: New test.
* testsuite/gas/mips/mips16-macro-e.d: New test.
* testsuite/gas/mips/mips16-macro-t.d: New test.
* testsuite/gas/mips/mips16-jal-t.l: New stderr output.
* testsuite/gas/mips/mips16-macro-e.l: New stderr output.
* testsuite/gas/mips/mips16-macro-t.l: New stderr output.
* testsuite/gas/mips/mips16-jal-e.s: New test source.
* testsuite/gas/mips/mips16-jal-t.s: New test source.
* testsuite/gas/mips/mips16-macro-e.s: New test source.
* testsuite/gas/mips/mips16-macro-t.s: New test source.
* testsuite/gas/mips/mips.exp: Run the new tests.

opcodes/
* mips-dis.c (print_mips16_insn_arg): Always handle `extend' and
`insn' together, with `extend' as the high-order 16 bits.
(match_kind): New enum.
(print_insn_mips16): Rework for 32-bit instruction matching.
Do not dump EXTEND prefixes here.
* mips16-opc.c (mips16_opcodes): Move "extend" entry to the end.
Recode `match' and `mask' fields as 32-bit in absolute "jal" and
"jalx" entries.

binutils/
* testsuite/binutils-all/mips/mips16-extend-noinsn.d: Adjust
test for separate EXTEND prefix disassembly.
21 files changed:
binutils/ChangeLog
binutils/testsuite/binutils-all/mips/mips16-extend-noinsn.d
gas/ChangeLog
gas/config/tc-mips.c
gas/testsuite/gas/mips/mips.exp
gas/testsuite/gas/mips/mips16-jal-e.d [new file with mode: 0644]
gas/testsuite/gas/mips/mips16-jal-e.s [new file with mode: 0644]
gas/testsuite/gas/mips/mips16-jal-t.d [new file with mode: 0644]
gas/testsuite/gas/mips/mips16-jal-t.l [new file with mode: 0644]
gas/testsuite/gas/mips/mips16-jal-t.s [new file with mode: 0644]
gas/testsuite/gas/mips/mips16-macro-e.d [new file with mode: 0644]
gas/testsuite/gas/mips/mips16-macro-e.l [new file with mode: 0644]
gas/testsuite/gas/mips/mips16-macro-e.s [new file with mode: 0644]
gas/testsuite/gas/mips/mips16-macro-t.d [new file with mode: 0644]
gas/testsuite/gas/mips/mips16-macro-t.l [new file with mode: 0644]
gas/testsuite/gas/mips/mips16-macro-t.s [new file with mode: 0644]
include/ChangeLog
include/opcode/mips.h
opcodes/ChangeLog
opcodes/mips-dis.c
opcodes/mips16-opc.c