Move X8632-specific Assembler stuff to Machine Traits.

src/IceRegistersX8632.h

Index: src/IceRegistersX8632.h
diff --git a/src/IceRegistersX8632.h b/src/IceRegistersX8632.h
index 86ace82533abdd46c013f7c8c214f584862084b5..d7bfd6f7db6d68c005f84d59b30fedee50a4d68c 100644
--- a/src/IceRegistersX8632.h
+++ b/src/IceRegistersX8632.h
@@ -20,93 +20,92 @@
 
 namespace Ice {
 
-namespace RegX8632 {
-
-// An enum of every register. The enum value may not match the encoding
-// used to binary encode register operands in instructions.
-enum AllRegisters {
+class RegX8632 {

[jvoung (off chromium), 2015/06/30 21:19:48]

Should RegX8664 get the same treatment (namespace -> class)?

[John, 2015/06/30 21:42:00]

This is already part of this patch. Nice catch, though. :)

[jvoung (off chromium), 2015/06/30 22:26:46]

I see "ConditionCodesX8664.h", but not RegistersX8664.h, but I could be missing
something.

[John, 2015/06/30 22:29:29]

I got confused.... Good catch.

+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, name, name16, name8, scratch, preserved, stackptr,      \
           frameptr, isI8, isInt, isFP)                                         \
   val,
-  REGX8632_TABLE
+    REGX8632_TABLE
 #undef X
-      Reg_NUM,
+        Reg_NUM,
 #define X(val, init) val init,
-  REGX8632_TABLE_BOUNDS
+    REGX8632_TABLE_BOUNDS
 #undef X
-};
+  };
 
-// An enum of GPR Registers. The enum value does match the encoding used
-// to binary encode register operands in instructions.
-enum GPRRegister {
+  // 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, name, name16, name8, scratch, preserved, stackptr,      \
           frameptr, isI8, isInt, isFP)                                         \
   Encoded_##val encode,
-  REGX8632_GPR_TABLE
+    REGX8632_GPR_TABLE
 #undef X
-      Encoded_Not_GPR = -1
-};
+        Encoded_Not_GPR = -1
+  };
 
-// An enum of XMM Registers. The enum value does match the encoding used
-// to binary encode register operands in instructions.
-enum XmmRegister {
+  // 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, name, name16, name8, scratch, preserved, stackptr,      \
           frameptr, isI8, isInt, isFP)                                         \
   Encoded_##val encode,
-  REGX8632_XMM_TABLE
+    REGX8632_XMM_TABLE
 #undef X
-      Encoded_Not_Xmm = -1
-};
+        Encoded_Not_Xmm = -1
+  };
 
-// An enum of Byte Registers. The enum value does match the encoding used
-// to binary encode register operands in instructions.
-enum ByteRegister {
+  // 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,
-  REGX8632_BYTEREG_TABLE
+    REGX8632_BYTEREG_TABLE
 #undef X
-      Encoded_Not_ByteReg = -1
-};
+        Encoded_Not_ByteReg = -1
+  };
 
-// An enum of X87 Stack Registers. The enum value does match the encoding used
-// to binary encode register operands in instructions.
-enum X87STRegister {
+  // An enum of X87 Stack Registers. The enum value does match the encoding used
+  // to binary encode register operands in instructions.
+  enum X87STRegister {
 #define X(val, encode, name) Encoded_##val encode,
-  X87ST_REGX8632_TABLE
+    X87ST_REGX8632_TABLE
 #undef X
-      Encoded_Not_X87STReg = -1
+        Encoded_Not_X87STReg = -1
+  };
+
+  static inline GPRRegister getEncodedGPR(int32_t RegNum) {
+    assert(Reg_GPR_First <= RegNum && RegNum <= Reg_GPR_Last);
+    return GPRRegister(RegNum - Reg_GPR_First);
+  }
+
+  static inline XmmRegister getEncodedXmm(int32_t RegNum) {
+    assert(Reg_XMM_First <= RegNum && RegNum <= Reg_XMM_Last);
+    return XmmRegister(RegNum - Reg_XMM_First);
+  }
+
+  static inline ByteRegister getEncodedByteReg(int32_t RegNum) {
+    assert(RegNum == Reg_ah || (Reg_GPR_First <= RegNum && RegNum <= Reg_ebx));
+    if (RegNum == Reg_ah)
+      return Encoded_Reg_ah;
+    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);
+  }
+
+  static inline X87STRegister getEncodedSTReg(int32_t RegNum) {
+    assert(Encoded_X87ST_First <= RegNum && RegNum <= Encoded_X87ST_Last);
+    return X87STRegister(RegNum);
+  }
 };
 
-static inline GPRRegister getEncodedGPR(int32_t RegNum) {
-  assert(Reg_GPR_First <= RegNum && RegNum <= Reg_GPR_Last);
-  return GPRRegister(RegNum - Reg_GPR_First);
-}
-
-static inline XmmRegister getEncodedXmm(int32_t RegNum) {
-  assert(Reg_XMM_First <= RegNum && RegNum <= Reg_XMM_Last);
-  return XmmRegister(RegNum - Reg_XMM_First);
-}
-
-static inline ByteRegister getEncodedByteReg(int32_t RegNum) {
-  assert(RegNum == Reg_ah || (Reg_GPR_First <= RegNum && RegNum <= Reg_ebx));
-  if (RegNum == Reg_ah)
-    return Encoded_Reg_ah;
-  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);
-}
-
-static inline X87STRegister getEncodedSTReg(int32_t RegNum) {
-  assert(Encoded_X87ST_First <= RegNum && RegNum <= Encoded_X87ST_Last);
-  return X87STRegister(RegNum);
-}
-
-} // end of namespace RegX8632
-
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEREGISTERSX8632_H