x86: have preprocessor expand macros

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.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index f94d0f439bf2cb0c4dfa24aeeeb8350d100e8f51..d8302d0dae1d20b0c1a8420ee60e4d27af579f76 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2021-02-16  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.
+
 2021-02-15  Andreas Krebbel  <krebbel@linux.ibm.com>
 
        * s390-mkopc.c (main): Accept arch14 as cpu string.

diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c
index 44cdc66198595bbc1790af1c922c5870d0dd912e..d7bd56dae3268855e07bc07aef829946d5c6b071 100644 (file)
--- a/opcodes/i386-gen.c
+++ b/opcodes/i386-gen.c
@@ -971,17 +971,6 @@ set_bitfield (char *f, bitfield *array, int value,
   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)
       {

diff --git a/opcodes/i386-opc.tbl b/opcodes/i386-opc.tbl
index 04e2a090ebae0e9ee9e3cd9f69dcdcd1371ea935..3b29dd5853db96c2a8712ec7565b3167c8a11040 100644 (file)
--- 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.