From patchwork Mon Feb 15 14:27:17 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: x86: have preprocessor expand macros
X-Patchwork-Submitter: Andreas Krebbel via Binutils <binutils@sourceware.org>
X-Patchwork-Id: 49160
Message-Id: <c51eafdc-0067-ef29-622f-d9501670c789@suse.com>
To: Binutils <binutils@sourceware.org>
Date: Mon, 15 Feb 2021 15:27:17 +0100
From: Jan Beulich via Binutils <binutils@sourceware.org>
List-Id: Binutils mailing list <binutils.sourceware.org>

There's no point having i386-gen's set_bitfield() to handle any aliases,
now that we pass the opcode table through the C preprocessor anyway.

opcodes/
2021-02-XX  Jan Beulich  <jbeulich@suse.com>

	* i386-gen.c (set_bitfield): Don't look for CpuFP, Mmword, nor
	Oword.
	* i386-opc.tbl (CpuFP, Mmword, Oword): Define.

--- a/opcodes/i386-gen.c
+++ b/opcodes/i386-gen.c
@@ -971,17 +971,6 @@ set_bitfield (char *f, bitfield *array,
   if (*f == '\0')
     return;
 
-  if (strcmp (f, "CpuFP") == 0)
-    {
-      set_bitfield("Cpu387", array, value, size, lineno);
-      set_bitfield("Cpu287", array, value, size, lineno);
-      f = "Cpu8087";
-    }
-  else if (strcmp (f, "Mmword") == 0)
-    f= "Qword";
-  else if (strcmp (f, "Oword") == 0)
-    f= "Xmmword";
-
   for (i = 0; i < size; i++)
     if (strcasecmp (array[i].name, f) == 0)
       {
--- a/opcodes/i386-opc.tbl
+++ b/opcodes/i386-opc.tbl
@@ -58,6 +58,9 @@
 
 #define RegBND Class=RegBND
 
+#define Mmword Qword
+#define Oword  Xmmword
+
 #define JumpByte         Jump=JUMP_BYTE
 #define JumpDword        Jump=JUMP_DWORD
 #define JumpAbsolute     Jump=JUMP_ABSOLUTE
@@ -106,6 +109,8 @@
 // operands may allow to switch from 3-byte to 2-byte VEX encoding.
 #define C StaticRounding
 
+#define CpuFP Cpu387|Cpu287|Cpu8087
+
 ### MARKER ###
 
 // Move instructions.