Lift register and condition code enums out into their own file.

src/IceInstX8632.def

 //===- subzero/src/IceInstX8632.def - X-macros for x86-32 insts -*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines properties of lowered x86-32 instructions in the
 // form of x-macros.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef SUBZERO_SRC_ICEINSTX8632_DEF
 #define SUBZERO_SRC_ICEINSTX8632_DEF
 
 // NOTE: esp is not considered isInt, to avoid register allocating it.
-#define REGX8632_TABLE                                                  \
-  /* val, init, name, name16, name8, scratch, preserved, stackptr,      \
+#define REGX8632_GPR_TABLE                                              \
+  /* val, encode, name, name16, name8, scratch, preserved, stackptr,    \
      frameptr, isI8, isInt, isFP */                                     \
   X(Reg_eax, = 0,             "eax",  "ax", "al", 1, 0, 0, 0, 1, 1, 0)  \
   X(Reg_ecx, = Reg_eax + 1,   "ecx",  "cx", "cl", 1, 0, 0, 0, 1, 1, 0)  \
   X(Reg_edx, = Reg_eax + 2,   "edx",  "dx", "dl", 1, 0, 0, 0, 1, 1, 0)  \
   X(Reg_ebx, = Reg_eax + 3,   "ebx",  "bx", "bl", 0, 1, 0, 0, 1, 1, 0)  \
   X(Reg_esp, = Reg_eax + 4,   "esp",  "sp", ""  , 0, 0, 1, 0, 0, 0, 0)  \
   X(Reg_ebp, = Reg_eax + 5,   "ebp",  "bp", ""  , 0, 1, 0, 1, 0, 1, 0)  \
   X(Reg_esi, = Reg_eax + 6,   "esi",  "si", ""  , 0, 1, 0, 0, 0, 1, 0)  \
-  X(Reg_edi, = Reg_eax + 7,   "edi",  "di", ""  , 0, 1, 0, 0, 0, 1, 0)  \
-  X(Reg_ah,  = Reg_edi + 1,   "???",  ""  , "ah", 0, 0, 0, 0, 1, 0, 0)  \
-  X(Reg_xmm0, = Reg_ah + 1,   "xmm0", ""  , ""  , 1, 0, 0, 0, 0, 0, 1)  \
+  X(Reg_edi, = Reg_eax + 7,   "edi",  "di", ""  , 0, 1, 0, 0, 0, 1, 0)
+
+#define REGX8632_XMM_TABLE                                              \
+  X(Reg_xmm0, = 0,            "xmm0", ""  , ""  , 1, 0, 0, 0, 0, 0, 1)  \
   X(Reg_xmm1, = Reg_xmm0 + 1, "xmm1", ""  , ""  , 1, 0, 0, 0, 0, 0, 1)  \
   X(Reg_xmm2, = Reg_xmm0 + 2, "xmm2", ""  , ""  , 1, 0, 0, 0, 0, 0, 1)  \
   X(Reg_xmm3, = Reg_xmm0 + 3, "xmm3", ""  , ""  , 1, 0, 0, 0, 0, 0, 1)  \
   X(Reg_xmm4, = Reg_xmm0 + 4, "xmm4", ""  , ""  , 1, 0, 0, 0, 0, 0, 1)  \
   X(Reg_xmm5, = Reg_xmm0 + 5, "xmm5", ""  , ""  , 1, 0, 0, 0, 0, 0, 1)  \
   X(Reg_xmm6, = Reg_xmm0 + 6, "xmm6", ""  , ""  , 1, 0, 0, 0, 0, 0, 1)  \
   X(Reg_xmm7, = Reg_xmm0 + 7, "xmm7", ""  , ""  , 1, 0, 0, 0, 0, 0, 1)  \
-//#define X(val, init, name, name16, name8, scratch, preserved, stackptr,
+//#define X(val, encode, name, name16, name8, scratch, preserved, stackptr,
 //          frameptr, isI8, isInt, isFP)
 
+// We also provide a combined table, so that there is a namespace where
+// all of the registers are considered and have distinct numberings.
+// This is in contrast to the above, where the "encode" is based on how
+// the register numbers will be encoded in binaries and values can overlap.
+#define REGX8632_TABLE                                                  \
+  /* val, encode, name, name16, name8, scratch, preserved, stackptr,    \
+     frameptr, isI8, isInt, isFP */                                     \
+  REGX8632_GPR_TABLE                                                    \
+  X(Reg_ah,  = Reg_eax + 4,   "???",  ""  , "ah", 0, 0, 0, 0, 1, 0, 0)  \
+  REGX8632_XMM_TABLE
+//#define X(val, encode, name, name16, name8, scratch, preserved, stackptr,
+//          frameptr, isI8, isInt, isFP)
+
+// We also need the encodings for the Byte registers (other info overlaps
+// what is in the REGX8632_GPR_TABLE).
+#define REGX8632_BYTEREG_TABLE                                          \
+  /* val, encode */                                                     \
+  X(Reg_al, = 0) \
+  X(Reg_cl, = 1) \
+  X(Reg_dl, = 2) \
+  X(Reg_bl, = 3) \
+  X(Reg_ah, = 4)
+//#define X(val, encode)
+
 // X86 segment registers.
 #define SEG_REGX8632_TABLE  \
   /* enum value, name */    \
   X(SegReg_CS, "cs")        \
   X(SegReg_DS, "ds")        \
   X(SegReg_ES, "es")        \
   X(SegReg_SS, "ss")        \
   X(SegReg_FS, "fs")        \
   X(SegReg_GS, "gs")        \
 //#define X(val, name)
 
 #define ICEINSTX8632BR_TABLE   \
-  /* enum value, opposite, dump, emit */ \
-  X(Br_a,        Br_be,    "a",  "ja")                \
-  X(Br_ae,       Br_b,     "ae", "jae")               \
-  X(Br_b,        Br_ae,    "b",  "jb")                \
-  X(Br_be,       Br_a,     "be", "jbe")               \
-  X(Br_e,        Br_ne,    "e",  "je")                \
-  X(Br_g,        Br_le,    "g",  "jg")                \
-  X(Br_ge,       Br_l,     "ge", "jge")               \
-  X(Br_l,        Br_ge,    "l",  "jl")                \
-  X(Br_le,       Br_g,     "le", "jle")               \
-  X(Br_ne,       Br_e,     "ne", "jne")               \
-  X(Br_np,       Br_p,     "np", "jnp")               \
-  X(Br_p,        Br_np,    "p",  "jp")                \
-//#define X(tag, opp, dump, emit)
+  /* enum value, encode, opposite, dump, emit */ \
+  X(Br_o,  = 0,       Br_no,    "o",  "jo")                \
+  X(Br_no, = 1,       Br_o,     "no", "jno")               \
+  X(Br_b,  = 2,       Br_ae,    "b",  "jb")                \
+  X(Br_ae, = 3,       Br_b,     "ae", "jae")               \
+  X(Br_e,  = 4,       Br_ne,    "e",  "je")                \
+  X(Br_ne, = 5,       Br_e,     "ne", "jne")               \
+  X(Br_be, = 6,       Br_a,     "be", "jbe")               \
+  X(Br_a,  = 7,       Br_be,    "a",  "ja")                \
+  X(Br_s,  = 8,       Br_ns,    "s",  "js")                \
+  X(Br_ns, = 9,       Br_s,     "ns", "jns")               \
+  X(Br_p,  = 10,      Br_np,    "p",  "jp")                \
+  X(Br_np, = 11,      Br_p,     "np", "jnp")               \
+  X(Br_l,  = 12,      Br_ge,    "l",  "jl")                \
+  X(Br_ge, = 13,      Br_l,     "ge", "jge")               \
+  X(Br_le, = 14,      Br_g,     "le", "jle")               \
+  X(Br_g,  = 15,      Br_le,    "g",  "jg")                \
+//#define X(tag, encode, opp, dump, emit)
 
 #define ICEINSTX8632CMPPS_TABLE \
   /* enum value, emit */        \
   X(Cmpps_eq,    "eq")          \
   X(Cmpps_lt,    "lt")          \
   X(Cmpps_le,    "le")          \
   X(Cmpps_unord, "unord")       \
   X(Cmpps_neq,   "neq")         \
   X(Cmpps_nlt,   "nlt")         \
   X(Cmpps_nle,   "nle")         \
@@ skipping 13 matching lines @@
   X(IceType_v4i1,  IceType_i32 , "?" , ""  , "d",  "xmmword ptr") \
   X(IceType_v8i1,  IceType_i16 , "?" , ""  , "w",  "xmmword ptr") \
   X(IceType_v16i1, IceType_i8  , "?" , ""  , "b",  "xmmword ptr") \
   X(IceType_v16i8, IceType_i8  , "?" , ""  , "b",  "xmmword ptr") \
   X(IceType_v8i16, IceType_i16 , "?" , ""  , "w",  "xmmword ptr") \
   X(IceType_v4i32, IceType_i32 , "dq", ""  , "d",  "xmmword ptr") \
   X(IceType_v4f32, IceType_f32 , "ps", ""  , "" ,  "xmmword ptr") \
 //#define X(tag, elementty, cvt, sdss, width)
 
 #endif // SUBZERO_SRC_ICEINSTX8632_DEF