From c423d21a43727fb4d27c10d43e6bbedced0f55d5 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 25 Jun 2020 09:30:09 +0200 Subject: [PATCH] x86: move ImmExt processing With abuses of ImmExt gone, all templates using it have operands. Move its main invocation into process_operands(), matching its secondary one for the SSE2AVX case. --- gas/ChangeLog | 6 ++++++ gas/config/tc-i386.c | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 12a593bbb01..8fc1d8417c9 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2020-06-25 Jan Beulich + + * config/tc-i386.c (md_assemble): Move call to process_immext() + ... + (process_operands): ... here. + 2020-06-25 Jan Beulich * config/tc-i386.c (process_suffix): Skip ambiguous operand size diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 66da7199c08..5bbc74c1277 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -4867,11 +4867,6 @@ md_assemble (char *line) && !i.types[j].bitfield.xmmword) i.reg_operands--; - /* ImmExt should be processed after SSE2AVX. */ - if (!i.tm.opcode_modifier.sse2avx - && i.tm.opcode_modifier.immext) - process_immext (); - /* For insns with operands there are more diddles to do to the opcode. */ if (i.operands) { @@ -7450,6 +7445,9 @@ process_operands (void) i.prefix[REX_PREFIX] = 0; i.rex_encoding = 0; } + /* ImmExt should be processed after SSE2AVX. */ + else if (i.tm.opcode_modifier.immext) + process_immext (); if (i.tm.opcode_modifier.sse2avx && i.tm.opcode_modifier.vexvvvv) { -- 2.30.2