diff options
| author | Nick Clifton <nickc@redhat.com> | 2015-08-11 09:49:18 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2015-08-11 09:49:18 +0100 |
| commit | e66c3c2568fcfebc931bc18d35055c7f784133ce (patch) | |
| tree | 7a0657f8087bea6ba333c4faee7b34c3cc8c2a0f /gas/config | |
| parent | d29b2a1ece30514431861472d784ae8722816a4c (diff) | |
| download | binutils-e66c3c2568fcfebc931bc18d35055c7f784133ce.zip binutils-e66c3c2568fcfebc931bc18d35055c7f784133ce.tar.gz binutils-e66c3c2568fcfebc931bc18d35055c7f784133ce.tar.bz2 | |
Convert 'A && (!A || B)' to 'A || B' in various places.
PR gas/18574
* config/tc-msp430.c (msp430_operands): Rewrite if statements to
remove redundant checks.
(md_apply_fix): Likewise.
Diffstat (limited to 'gas/config')
| -rw-r--r-- | gas/config/tc-msp430.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c index 5307746..17c5fbe 100644 --- a/gas/config/tc-msp430.c +++ b/gas/config/tc-msp430.c @@ -2069,7 +2069,7 @@ msp430_operands (struct msp430_opcode_s * opcode, char * line) if (op1.exp.X_op == O_constant) extended |= ((op1.exp.X_add_number >> 16) & 0xf) << 7; - else if (op1.reg || (op1.reg == 0 && op1.am == 3)) /* Not PC relative. */ + else if (op1.reg || op1.am == 3) /* Not PC relative. */ fix_new_exp (frag_now, where, 6, &(op1.exp), FALSE, BFD_RELOC_MSP430X_ABS20_EXT_SRC); else @@ -2155,7 +2155,7 @@ msp430_operands (struct msp430_opcode_s * opcode, char * line) if (op1.exp.X_op == O_constant) extended |= ((op1.exp.X_add_number >> 16) & 0xf) << 7; - else if (op1.reg || (op1.reg == 0 && op1.am == 3)) /* Not PC relative. */ + else if (op1.reg || op1.am == 3) /* Not PC relative. */ fix_new_exp (frag_now, where, 6, &(op1.exp), FALSE, BFD_RELOC_MSP430X_ABS20_EXT_SRC); else @@ -2201,7 +2201,7 @@ msp430_operands (struct msp430_opcode_s * opcode, char * line) if (!extended_op) { - if (op1.reg || (op1.reg == 0 && op1.am == 3)) /* Not PC relative. */ + if (op1.reg || op1.am == 3) /* Not PC relative. */ fix_new_exp (frag_now, where, 2, &(op1.exp), FALSE, CHECK_RELOC_MSP430 (op1)); else @@ -2271,7 +2271,7 @@ msp430_operands (struct msp430_opcode_s * opcode, char * line) bfd_putl16 ((bfd_vma) ZEROS, frag + 2); - if (op1.reg || (op1.reg == 0 && op1.am == 3)) + if (op1.reg || op1.am == 3) fix_new_exp (frag_now, where, 2, &(op1.exp), FALSE, CHECK_RELOC_MSP430 (op1)); else @@ -2799,7 +2799,7 @@ msp430_operands (struct msp430_opcode_s * opcode, char * line) if (op1.exp.X_op == O_constant) extended |= ((op1.exp.X_add_number >> 16) & 0xf) << 7; - else if (op1.reg || (op1.reg == 0 && op1.am == 3)) /* Not PC relative. */ + else if (op1.reg || op1.am == 3) /* Not PC relative. */ fix_new_exp (frag_now, where, 6, &(op1.exp), FALSE, BFD_RELOC_MSP430X_ABS20_EXT_SRC); else @@ -2845,7 +2845,7 @@ msp430_operands (struct msp430_opcode_s * opcode, char * line) if (!extended_op) { - if (op1.reg || (op1.reg == 0 && op1.am == 3)) /* Not PC relative. */ + if (op1.reg || op1.am == 3) /* Not PC relative. */ fix_new_exp (frag_now, where, 2, &(op1.exp), FALSE, CHECK_RELOC_MSP430 (op1)); else @@ -2947,7 +2947,7 @@ msp430_operands (struct msp430_opcode_s * opcode, char * line) if (op1.exp.X_op == O_constant) extended |= ((op1.exp.X_add_number >> 16) & 0xf) << 7; - else if (op1.reg || (op1.reg == 0 && op1.am == 3)) /* Not PC relative. */ + else if (op1.reg || op1.am == 3) /* Not PC relative. */ fix_new_exp (frag_now, where, 6, &(op1.exp), FALSE, BFD_RELOC_MSP430X_ABS20_EXT_SRC); else @@ -2978,7 +2978,7 @@ msp430_operands (struct msp430_opcode_s * opcode, char * line) if (!extended_op) { - if (op1.reg || (op1.reg == 0 && op1.am == 3)) /* Not PC relative. */ + if (op1.reg || op1.am == 3) /* Not PC relative. */ fix_new_exp (frag_now, where, 2, &(op1.exp), FALSE, CHECK_RELOC_MSP430 (op1)); else @@ -3323,8 +3323,8 @@ md_apply_fix (fixS * fixp, valueT * valuep, segT seg) if (msp430_enable_polys && !msp430_enable_relax) { - if (!fixp->fx_addsy || (fixp->fx_addsy - && S_GET_SEGMENT (fixp->fx_addsy) == absolute_section)) + if (!fixp->fx_addsy + || S_GET_SEGMENT (fixp->fx_addsy) == absolute_section) fixp->fx_done = 1; /* It is ok to kill 'abs' reloc. */ else fixp->fx_done = 0; |