This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Don't use boolean OR in arithmetic expressions
- From: Alan Modra <amodra at gmail dot com>
- To: binutils at sourceware dot org
- Date: Thu, 6 Oct 2016 09:53:35 +1030
- Subject: Don't use boolean OR in arithmetic expressions
- Authentication-results: sourceware.org; auth=none
bfd/
* elf32-epiphany.c (epiphany_final_link_relocate): Use bitwise
OR in arithmetic expression, not boolean OR.
opcodes/
* cr16-dis.c (print_insn_cr16): Don't use boolean OR in arithmetic.
* crx-dis.c (print_insn_crx): Likewise.
diff --git a/bfd/elf32-epiphany.c b/bfd/elf32-epiphany.c
index 420dc8b..6b798b1 100644
--- a/bfd/elf32-epiphany.c
+++ b/bfd/elf32-epiphany.c
@@ -420,9 +420,10 @@ epiphany_final_link_relocate (reloc_howto_type * howto,
relocation += rel->r_addend;
if ((unsigned int) relocation > 0x7ff)
return bfd_reloc_outofrange;
+ /* Fall through. */
disp11:
- relocation = ((relocation & 7) << 5)
- || ((relocation & 0x7f8 ) << 13);
+ relocation = (((relocation & 7) << 5)
+ | ((relocation & 0x7f8 ) << 13));
return _bfd_relocate_contents (howto, input_bfd, relocation,
contents + rel->r_offset);
diff --git a/opcodes/cr16-dis.c b/opcodes/cr16-dis.c
index 3c901f9..1d7054a 100644
--- a/opcodes/cr16-dis.c
+++ b/opcodes/cr16-dis.c
@@ -815,7 +815,7 @@ print_insn_cr16 (bfd_vma memaddr, struct disassemble_info *info)
/* Find a matching opcode in table. */
is_decoded = cr16_match_opcode ();
/* If found, print the instruction's mnemonic and arguments. */
- if (is_decoded > 0 && (cr16_words[0] << 16 || cr16_words[1]) != 0)
+ if (is_decoded > 0 && (cr16_words[0] != 0 || cr16_words[1] != 0))
{
if (strneq (instruction->mnemonic, "cinv", 4))
info->fprintf_func (info->stream,"%s", getcinvstring (instruction->mnemonic));
diff --git a/opcodes/crx-dis.c b/opcodes/crx-dis.c
index 2da70ed..d6b129e 100644
--- a/opcodes/crx-dis.c
+++ b/opcodes/crx-dis.c
@@ -727,7 +727,7 @@ print_insn_crx (bfd_vma memaddr, struct disassemble_info *info)
/* Find a matching opcode in table. */
is_decoded = match_opcode ();
/* If found, print the instruction's mnemonic and arguments. */
- if (is_decoded > 0 && (words[0] << 16 || words[1]) != 0)
+ if (is_decoded > 0 && (words[0] != 0 || words[1] != 0))
{
info->fprintf_func (info->stream, "%s", instruction->mnemonic);
if ((currInsn.nargs = get_number_of_operands ()) != 0)
--
Alan Modra
Australia Development Lab, IBM