Subzero: Refactor x86 register definitions to use the alias mechanism.

src/IceRegistersX8664.h

Index: src/IceRegistersX8664.h
diff --git a/src/IceRegistersX8664.h b/src/IceRegistersX8664.h
index 3a10f00e26794c7730bd182891e17c4c9912459b..d9ca1f95bf44edaa672217f02f05716334c45ea8 100644
--- a/src/IceRegistersX8664.h
+++ b/src/IceRegistersX8664.h
@@ -26,23 +26,22 @@ public:
   /// An enum of every register. The enum value may not match the encoding used
   /// to binary encode register operands in instructions.
   enum AllRegisters {
-#define X(val, encode, name64, name, name16, name8, scratch, preserved,        \
-          stackptr, frameptr, isInt, isFP)                                     \
+#define X(val, encode, name, base, scratch, preserved, stackptr, frameptr,     \
+          isGPR, is64, is32, is16, is8, isXmm, is64To8, is32To8, is16To8,      \
+          isTrunc8Rcvr, isAhRcvr, aliases)                                     \
   val,
     REGX8664_TABLE
 #undef X
-        Reg_NUM,
-#define X(val, init) val init,
-    REGX8664_TABLE_BOUNDS
-#undef X
+        Reg_NUM
   };
 
   /// An enum of GPR Registers. The enum value does match the encoding used to
   /// binary encode register operands in instructions.
   enum GPRRegister {
-#define X(val, encode, name64, name, name16, name8, scratch, preserved,        \
-          stackptr, frameptr, isInt, isFP)                                     \
-  Encoded_##val encode,
+#define X(val, encode, name, base, scratch, preserved, stackptr, frameptr,     \
+          isGPR, is64, is32, is16, is8, isXmm, is64To8, is32To8, is16To8,      \
+          isTrunc8Rcvr, isAhRcvr, aliases)                                     \
+  Encoded_##val = encode,
     REGX8664_GPR_TABLE
 #undef X
         Encoded_Not_GPR = -1
@@ -51,9 +50,10 @@ public:
   /// An enum of XMM Registers. The enum value does match the encoding used to
   /// binary encode register operands in instructions.
   enum XmmRegister {
-#define X(val, encode, name64, name, name16, name8, scratch, preserved,        \
-          stackptr, frameptr, isInt, isFP)                                     \
-  Encoded_##val encode,
+#define X(val, encode, name, base, scratch, preserved, stackptr, frameptr,     \
+          isGPR, is64, is32, is16, is8, isXmm, is64To8, is32To8, is16To8,      \
+          isTrunc8Rcvr, isAhRcvr, aliases)                                     \
+  Encoded_##val = encode,
     REGX8664_XMM_TABLE
 #undef X
         Encoded_Not_Xmm = -1
@@ -62,36 +62,14 @@ public:
   /// An enum of Byte Registers. The enum value does match the encoding used to
   /// binary encode register operands in instructions.
   enum ByteRegister {
-#define X(val, encode) Encoded_##val encode,
+#define X(val, encode, name, base, scratch, preserved, stackptr, frameptr,     \
+          isGPR, is64, is32, is16, is8, isXmm, is64To8, is32To8, is16To8,      \
+          isTrunc8Rcvr, isAhRcvr, aliases)                                     \
+  Encoded_8_##val = encode,
     REGX8664_BYTEREG_TABLE
 #undef X
         Encoded_Not_ByteReg = -1
   };
-
-  static inline GPRRegister getEncodedGPR(int32_t RegNum) {
-    assert(Reg_GPR_First <= RegNum);
-    assert(RegNum <= Reg_GPR_Last);
-    return GPRRegister(RegNum - Reg_GPR_First);
-  }
-
-  static inline XmmRegister getEncodedXmm(int32_t RegNum) {
-    assert(Reg_XMM_First <= RegNum);
-    assert(RegNum <= Reg_XMM_Last);
-    return XmmRegister(RegNum - Reg_XMM_First);
-  }
-
-  static inline ByteRegister getEncodedByteReg(int32_t RegNum) {
-    assert(Reg_GPR_First <= RegNum);
-    assert(RegNum <= Reg_GPR_Last);
-    return ByteRegister(RegNum - Reg_GPR_First);
-  }
-
-  static inline GPRRegister getEncodedByteRegOrGPR(Type Ty, int32_t RegNum) {
-    if (isByteSizedType(Ty))
-      return GPRRegister(getEncodedByteReg(RegNum));
-    else
-      return getEncodedGPR(RegNum);
-  }
 };
 
 } // end of namespace Ice