include/opcode/

[deliverable/binutils-gdb.git] / gas / config / tc-mips.c

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index d08bcd3f466db87d758238480023f1e1518eb00d..afa8b3876a0cd452e36b728723d83c2e4339e1a2 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -3148,21 +3148,13 @@ can_swap_branch_p (struct mips_cl_insn *ip)
       && history[0].frag->fr_type == rs_machine_dependent)
     return FALSE;
 
-  /* We do not swap with a trap instruction, since it complicates trap
-     handlers to have the trap instruction be in a delay slot.  */
+  /* We do not swap with instructions that cannot architecturally
+     be placed in a branch delay slot, such as SYNC or ERET.  We
+     also refrain from swapping with a trap instruction, since it
+     complicates trap handlers to have the trap instruction be in
+     a delay slot.  */
   prev_pinfo = history[0].insn_mo->pinfo;
-  if (prev_pinfo & INSN_TRAP)
-    return FALSE;
-
-  /* If the previous instruction is a sync, sync.l, or sync.p, we can
-     not swap.  */
-  if (prev_pinfo & INSN_SYNC)
-    return FALSE;
-
-  /* If the previous instruction is an ERET or DERET, avoid the swap.  */
-  if (history[0].insn_opcode == INSN_ERET)
-    return FALSE;
-  if (history[0].insn_opcode == INSN_DERET)
+  if (prev_pinfo & INSN_NO_DELAY_SLOT)
     return FALSE;
 
   /* Check for conflicts between the branch and the instructions