aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/config/tc-mips.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 97be1d4..ed0f297 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-01 Maciej W. Rozycki <macro@codesourcery.com>
+
+ * config/tc-mips.c (is_delay_slot_valid): Simplify expression.
+
2012-11-01 Chao-ying Fu <fu@mips.com>
* config/tc-mips.c (append_insn): Set fx_no_overflow for 16-bit
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 4f7ead9..024b864 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -2321,8 +2321,7 @@ is_delay_slot_valid (const struct mips_opcode *mo)
return TRUE;
if (mo->pinfo == INSN_MACRO)
- return ((history[0].insn_mo->pinfo2 & INSN2_BRANCH_DELAY_16BIT) == 0
- ? TRUE : FALSE);
+ return (history[0].insn_mo->pinfo2 & INSN2_BRANCH_DELAY_16BIT) == 0;
if ((history[0].insn_mo->pinfo2 & INSN2_BRANCH_DELAY_32BIT) != 0
&& micromips_insn_length (mo) != 4)
return FALSE;