x86/Intel: fold "xmmword" with "oword"

These are full aliases of one another, so there's no real need to use
distinct O_md* values for them.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3f9344e0e811ebab53e8d95ff1ae7d58d2bee8ac..4d2b7384ec80260834e6e484fd1dde20ec84c2d1 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2019-12-09  Jan Beulich  <jbeulich@suse.com>
+
+       * config/tc-i386-intel.c (O_oword_ptr): Move.
+       (O_xmmword_ptr): Alias to O_oword_ptr.
+       (O_fword_ptr, O_tbyte_ptr, O_ymmword_ptr, O_zmmword_ptr): Adjust
+       expansion.
+       (i386_intel_simplify, i386_intel_operand): Fold O_oword_ptr and
+       O_xmmword_ptr cases, leaving comments.
+
 2019-12-09  Jan Beulich  <jbeulich@suse.com>
 
        * config/tc-i386-intel.c (O_mmword_ptr): Define.

diff --git a/gas/config/tc-i386-intel.c b/gas/config/tc-i386-intel.c
index 2f79d36d397d62517334339eb1817718455fe04b..bd88592ace814713111e5244fb056f40cf88138c 100644 (file)
--- a/gas/config/tc-i386-intel.c
+++ b/gas/config/tc-i386-intel.c
@@ -54,18 +54,18 @@ intel_state;
 #define O_qword_ptr O_md25
 /* mmword ptr X_add_symbol */
 #define O_mmword_ptr O_qword_ptr
-/* oword ptr X_add_symbol */
-#define O_oword_ptr O_md24
 /* fword ptr X_add_symbol */
-#define O_fword_ptr O_md23
+#define O_fword_ptr O_md24
 /* tbyte ptr X_add_symbol */
-#define O_tbyte_ptr O_md22
+#define O_tbyte_ptr O_md23
+/* oword ptr X_add_symbol */
+#define O_oword_ptr O_md22
 /* xmmword ptr X_add_symbol */
-#define O_xmmword_ptr O_md21
+#define O_xmmword_ptr O_oword_ptr
 /* ymmword ptr X_add_symbol */
-#define O_ymmword_ptr O_md20
+#define O_ymmword_ptr O_md21
 /* zmmword ptr X_add_symbol */
-#define O_zmmword_ptr O_md19
+#define O_zmmword_ptr O_md20
 
 static struct
   {
@@ -388,8 +388,7 @@ static int i386_intel_simplify (expressionS *e)
     case O_fword_ptr:
     case O_qword_ptr: /* O_mmword_ptr */
     case O_tbyte_ptr:
-    case O_oword_ptr:
-    case O_xmmword_ptr:
+    case O_oword_ptr: /* O_xmmword_ptr */
     case O_ymmword_ptr:
     case O_zmmword_ptr:
     case O_near_ptr:
@@ -702,8 +701,7 @@ i386_intel_operand (char *operand_string, int got_a_float)
            i.types[this_operand].bitfield.byte = 1; /* cause an error */
          break;
 
-       case O_oword_ptr:
-       case O_xmmword_ptr:
+       case O_oword_ptr: /* O_xmmword_ptr */
          i.types[this_operand].bitfield.xmmword = 1;
          break;