x86: convert RegMask and RegBND from bitfield to enumerator

[deliverable/binutils-gdb.git] / opcodes / i386-opc.h

diff --git a/opcodes/i386-opc.h b/opcodes/i386-opc.h
index 197c38803dfdef3d2c5d53c4ca2d17ff17a12fca..dcb8ea3ca373b93ad09d72b71b1206fd50758476 100644 (file)
--- a/opcodes/i386-opc.h
+++ b/opcodes/i386-opc.h
@@ -715,6 +715,8 @@ enum operand_class
   RegTR, /* Test register */
   RegMMX, /* MMX register */
   RegSIMD, /* XMM/YMM/ZMM registers, distinguished by operand size */
+  RegMask, /* Vector Mask register */
+  RegBND, /* Bound register */
 };
 
 /* Position of operand_type bits.  */
@@ -723,8 +725,6 @@ enum
 {
   /* Class */
   Class = CLASS_WIDTH - 1,
-  /* Vector Mask registers */
-  RegMask,
   /* 1 bit immediate */
   Imm1,
   /* 8 bit immediate */
@@ -791,9 +791,6 @@ enum
   /* Any memory size.  */
   Anysize,
 
-  /* Bound register.  */
-  RegBND,
-
   /* The number of bits in i386_operand_type.  */
   OTNum
 };
@@ -812,7 +809,6 @@ typedef union i386_operand_type
   struct
     {
       unsigned int class:CLASS_WIDTH;
-      unsigned int regmask:1;
       unsigned int imm1:1;
       unsigned int imm8:1;
       unsigned int imm8s:1;
@@ -842,7 +838,6 @@ typedef union i386_operand_type
       unsigned int zmmword:1;
       unsigned int unspecified:1;
       unsigned int anysize:1;
-      unsigned int regbnd:1;
 #ifdef OTUnused
       unsigned int unused:(OTNumOfBits - OTUnused);
 #endif