From ac4eb736520174305bf6e691827f7473b858cff1 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 12 Sep 2014 09:46:30 +0930 Subject: [PATCH] Fix tc-i386.c -Werror=logical-not-parentheses error * config/tc-i386.c (match_template): Remove redundant "!!" testing single-bit bitfields. (build_modrm_byte): Don't compare single-bit bitfields to "1". --- gas/ChangeLog | 6 ++++++ gas/config/tc-i386.c | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index f355c9cdc86..c5d7db6a180 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2014-09-12 Alan Modra + + * config/tc-i386.c (match_template): Remove redundant "!!" testing + single-bit bitfields. + (build_modrm_byte): Don't compare single-bit bitfields to "1". + 2014-09-09 Kyrylo Tkachov * config/tc-arm.c (arm_cpus): Add cortex-a17. diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index ab5a319d04e..5da257fbd32 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -4709,9 +4709,9 @@ match_template (void) && !operand_types[0].bitfield.regymm && !operand_types[0].bitfield.regzmm) || (!operand_types[t->operands > 1].bitfield.regmmx - && !!operand_types[t->operands > 1].bitfield.regxmm - && !!operand_types[t->operands > 1].bitfield.regymm - && !!operand_types[t->operands > 1].bitfield.regzmm)) + && operand_types[t->operands > 1].bitfield.regxmm + && operand_types[t->operands > 1].bitfield.regymm + && operand_types[t->operands > 1].bitfield.regzmm)) && (t->base_opcode != 0x0fc7 || t->extension_opcode != 1 /* cmpxchg8b */)) continue; @@ -4726,7 +4726,7 @@ match_template (void) && ((!operand_types[0].bitfield.regmmx && !operand_types[0].bitfield.regxmm) || (!operand_types[t->operands > 1].bitfield.regmmx - && !!operand_types[t->operands > 1].bitfield.regxmm))) + && operand_types[t->operands > 1].bitfield.regxmm))) continue; /* Do not verify operands when there are none. */ @@ -6171,8 +6171,8 @@ build_modrm_byte (void) op = i.tm.operand_types[vvvv]; op.bitfield.regmem = 0; if ((dest + 1) >= i.operands - || (op.bitfield.reg32 != 1 - && !op.bitfield.reg64 != 1 + || (!op.bitfield.reg32 + && op.bitfield.reg64 && !operand_type_equal (&op, ®xmm) && !operand_type_equal (&op, ®ymm) && !operand_type_equal (&op, ®zmm) -- 2.30.2