aboutsummaryrefslogtreecommitdiff
path: root/opcodes
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2021-02-16 11:27:40 +0100
committerJan Beulich <jbeulich@suse.com>2021-02-16 11:27:40 +0100
commitb818b220e40a0b5aa281e50272f6f6af2f759c86 (patch)
treef63bab0764f23db4596c0ccd291c44b993e648b5 /opcodes
parentc2f1204d1f7ceb36149d053509fce2f93733bd74 (diff)
downloadfsf-binutils-gdb-b818b220e40a0b5aa281e50272f6f6af2f759c86.zip
fsf-binutils-gdb-b818b220e40a0b5aa281e50272f6f6af2f759c86.tar.gz
fsf-binutils-gdb-b818b220e40a0b5aa281e50272f6f6af2f759c86.tar.bz2
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.
Diffstat (limited to 'opcodes')
-rw-r--r--opcodes/ChangeLog6
-rw-r--r--opcodes/i386-gen.c11
-rw-r--r--opcodes/i386-opc.tbl5
3 files changed, 11 insertions, 11 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index f94d0f4..d8302d0 100644
--- 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 44cdc66..d7bd56d 100644
--- 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 04e2a09..3b29dd5 100644
--- 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.