2007-09-05 H.J. Lu <hongjiu.lu@intel.com>

	* config/tc-i386.c (i386_index_check): Don't use RegRex
	on the reg_type field.
	(parse_real_register): Use `||' instead of `|'.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 719d5b3473d5ef15647d37f6b4d6a78b3f25535d..155a077b78b39686488fc7cee4ca801457093287 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * config/tc-i386.c (i386_index_check): Don't use RegRex
+       on the reg_type field.
+       (parse_real_register): Use `||' instead of `|'.
+
 2007-09-04  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/tc-i386.c (process_operands): Remove segment override

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 9a39d4309b8bdb22ff287a943a9c2642276612b9..a5ac843c96bd1cb19c3452d5a9a9cdc8cde8c3b8 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -4981,7 +4981,7 @@ i386_index_check (const char *operand_string)
        {
          /* 16bit checks.  */
          if ((i.base_reg
-              && ((i.base_reg->reg_type & (Reg16 | BaseIndex | RegRex))
+              && ((i.base_reg->reg_type & (Reg16 | BaseIndex))
                   != (Reg16 | BaseIndex)))
              || (i.index_reg
                  && (((i.index_reg->reg_type & (Reg16 | BaseIndex))
@@ -4996,9 +4996,9 @@ i386_index_check (const char *operand_string)
        {
          /* 32bit checks.  */
          if ((i.base_reg
-              && (i.base_reg->reg_type & (Reg32 | RegRex)) != Reg32)
+              && (i.base_reg->reg_type & Reg32) != Reg32)
              || (i.index_reg
-                 && ((i.index_reg->reg_type & (Reg32 | BaseIndex | RegRex))
+                 && ((i.index_reg->reg_type & (Reg32 | BaseIndex))
                      != (Reg32 | BaseIndex))))
            ok = 0;
        }
@@ -5885,7 +5885,8 @@ parse_real_register (char *reg_string, char **end_op)
     }
 
   if (r != NULL
-      && ((r->reg_flags & (RegRex64 | RegRex)) | (r->reg_type & Reg64)) != 0
+      && ((r->reg_flags & (RegRex64 | RegRex))
+         || (r->reg_type & Reg64))
       && (r->reg_type != Control || !(cpu_arch_flags & CpuSledgehammer))
       && flag_code != CODE_64BIT)
     return (const reg_entry *) NULL;