From 4787f4a5860864337c4f1261713b9462b79ea16a Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 1 Jun 2018 08:39:08 +0200 Subject: [PATCH] x86: simplify control register check ... as is already done elsewhere: There's no need for the use of operand_type_equal() here - the bit identifying control registers isn't used for any other purposes. --- gas/ChangeLog | 5 +++++ gas/config/tc-i386.c | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 199a48d8303..fdf8b2b13ff 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2018-06-01 Jan Beulich + + * config/tc-i386.c (control): Delete. + (parse_real_register): Simply check "control" bit. Re-wrap. + 2018-06-01 Jan Beulich * config/tc-i386.c (build_modrm_byte): Drop REX_B from condition diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 3d04a8361d9..07a4e11320a 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -1832,7 +1832,6 @@ operand_type_xor (i386_operand_type x, i386_operand_type y) static const i386_operand_type acc32 = OPERAND_TYPE_ACC32; static const i386_operand_type acc64 = OPERAND_TYPE_ACC64; -static const i386_operand_type control = OPERAND_TYPE_CONTROL; static const i386_operand_type inoutportreg = OPERAND_TYPE_INOUTPORTREG; static const i386_operand_type reg16_inoutportreg @@ -10274,10 +10273,8 @@ parse_real_register (char *reg_string, char **end_op) i.vec_encoding = vex_encoding_evex; } - if (((r->reg_flags & (RegRex64 | RegRex)) - || r->reg_type.bitfield.qword) - && (!cpu_arch_flags.bitfield.cpulm - || !operand_type_equal (&r->reg_type, &control)) + if (((r->reg_flags & (RegRex64 | RegRex)) || r->reg_type.bitfield.qword) + && (!cpu_arch_flags.bitfield.cpulm || !r->reg_type.bitfield.control) && flag_code != CODE_64BIT) return (const reg_entry *) NULL; -- 2.30.2