diff options
-rw-r--r-- | gas/ChangeLog | 5 | ||||
-rw-r--r-- | gas/config/tc-mips.c | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index e2efc11..340090a 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,10 @@ 2005-03-09 Richard Sandiford <rsandifo@redhat.com> + * config/tc-mips.c (append_insn): Remove now-redundant nops != 0 + check from branch delay code. Remove unnecessary check for branches. + +2005-03-09 Richard Sandiford <rsandifo@redhat.com> + * config/tc-mips.c (dummy_opcode): Delete. (nop_insn, mips16_nop_insn): New variables. (NOP_INSN): New macro. diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 5a3deda..77b5535 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -2472,9 +2472,6 @@ append_insn (struct mips_cl_insn *ip, expressionS *address_expr, /* If we have seen .set volatile or .set nomove, don't optimize. */ || mips_opts.nomove != 0 - /* If we had to emit any NOP instructions, then we - already know we can not swap. */ - || nops != 0 /* We can't swap if the previous instruction's position is fixed. */ || history[0].fixed_p @@ -2536,11 +2533,6 @@ append_insn (struct mips_cl_insn *ip, expressionS *address_expr, /* Itbl support may require additional care here. */ && (prev_pinfo & INSN_COPROC_MEMORY_DELAY) && ! cop_mem_interlocks) - /* We can not swap with a branch instruction. */ - || (prev_pinfo - & (INSN_UNCOND_BRANCH_DELAY - | INSN_COND_BRANCH_DELAY - | INSN_COND_BRANCH_LIKELY)) /* We do not swap with a trap instruction, since it complicates trap handlers to have the trap instruction be in a delay slot. */ |