diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2010-07-06 00:02:46 +0000 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@linux-mips.org> | 2010-07-06 00:02:46 +0000 |
| commit | 9a2c7088871654be1a94ea4d721fb9c76b4a3162 (patch) | |
| tree | b75cc830de7cef29246d029e0b3a296707b88d2f /gas/config | |
| parent | bf501491eae0fd3a0451fded1a51fe58f6010e11 (diff) | |
| download | gdb-9a2c7088871654be1a94ea4d721fb9c76b4a3162.zip gdb-9a2c7088871654be1a94ea4d721fb9c76b4a3162.tar.gz gdb-9a2c7088871654be1a94ea4d721fb9c76b4a3162.tar.bz2 | |
gas/
* config/tc-mips.c (nops_for_insn_or_target): Replace
MIPS16_INSN_BRANCH with MIPS16_INSN_UNCOND_BRANCH and
MIPS16_INSN_COND_BRANCH.
include/opcode/
* mips.h (MIPS16_INSN_UNCOND_BRANCH): New macro.
(MIPS16_INSN_BRANCH): Rename to...
(MIPS16_INSN_COND_BRANCH): ... this.
opcodes/
* mips-dis.c (print_mips16_insn_arg): Remove branch instruction
type and delay slot determination.
(print_insn_mips16): Extend branch instruction type and delay
slot determination to cover all instructions.
* mips16-opc.c (BR): Remove macro.
(UBR, CBR): New macros.
(mips16_opcodes): Update branch annotation for "b", "beqz",
"bnez", "bteqz" and "btnez". Add branch annotation for "jalrc"
and "jrc".
Diffstat (limited to 'gas/config')
| -rw-r--r-- | gas/config/tc-mips.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 4765ac7..4025f12 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -2730,7 +2730,9 @@ nops_for_insn_or_target (const struct mips_cl_insn *hist, if (tmp_nops > nops) nops = tmp_nops; } - else if (mips_opts.mips16 && (insn->insn_mo->pinfo & MIPS16_INSN_BRANCH)) + else if (mips_opts.mips16 + && (insn->insn_mo->pinfo & (MIPS16_INSN_UNCOND_BRANCH + | MIPS16_INSN_COND_BRANCH))) { tmp_nops = nops_for_sequence (1, hist, insn); if (tmp_nops > nops) |