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

unittest/AssemblerX8664/TestUtil.h

 
 //===- subzero/unittest/unittest/AssemblerX8664/TestUtil.h ------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ skipping 11 matching lines @@
 #include <cassert>
 #include <sys/mman.h>
 
 namespace Ice {
 namespace X8664 {
 namespace Test {
 
 class AssemblerX8664TestBase : public ::testing::Test {
 protected:
   using Address = AssemblerX8664::Traits::Address;
-  using ByteRegister = AssemblerX8664::Traits::ByteRegister;
   using Cond = AssemblerX8664::Traits::Cond;
   using GPRRegister = AssemblerX8664::Traits::GPRRegister;
+  using ByteRegister = AssemblerX8664::Traits::ByteRegister;
   using Traits = AssemblerX8664::Traits;
   using XmmRegister = AssemblerX8664::Traits::XmmRegister;
 
 // The following are "nicknames" for all possible GPRs in x86-64. With those, we
 // can use, e.g.,
 //
 //  Encoded_GPR_al()
 //
 // instead of GPRRegister::Encoded_Reg_eax for 8 bit operands. They also
 // introduce "regular" nicknames for legacy x86-32 register (e.g., eax becomes
 // r1; esp, r0).
 #define LegacyRegAliases(NewName, Name64, Name32, Name16, Name8)               \
   static constexpr GPRRegister Encoded_GPR_##NewName() {                       \
     return GPRRegister::Encoded_Reg_##Name32;                                  \
   }                                                                            \
   static constexpr GPRRegister Encoded_GPR_##NewName##q() {                    \
     return GPRRegister::Encoded_Reg_##Name32;                                  \
   }                                                                            \
   static constexpr GPRRegister Encoded_GPR_##NewName##d() {                    \
     return GPRRegister::Encoded_Reg_##Name32;                                  \
   }                                                                            \
   static constexpr GPRRegister Encoded_GPR_##NewName##w() {                    \
     return GPRRegister::Encoded_Reg_##Name32;                                  \
   }                                                                            \
   static constexpr GPRRegister Encoded_GPR_##NewName##l() {                    \
     return GPRRegister::Encoded_Reg_##Name32;                                  \
   }                                                                            \
+  static constexpr ByteRegister Encoded_Bytereg_##NewName() {                  \
+    return ByteRegister::Encoded_8_Reg_##Name8;                                \
+  }                                                                            \
   static constexpr GPRRegister Encoded_GPR_##Name64() {                        \
     return GPRRegister::Encoded_Reg_##Name32;                                  \
   }                                                                            \
   static constexpr GPRRegister Encoded_GPR_##Name32() {                        \
     return GPRRegister::Encoded_Reg_##Name32;                                  \
   }                                                                            \
   static constexpr GPRRegister Encoded_GPR_##Name16() {                        \
     return GPRRegister::Encoded_Reg_##Name32;                                  \
   }                                                                            \
   static constexpr GPRRegister Encoded_GPR_##Name8() {                         \
     return GPRRegister::Encoded_Reg_##Name32;                                  \
   }
 #define NewRegAliases(Name)                                                    \
   static constexpr GPRRegister Encoded_GPR_##Name() {                          \
     return GPRRegister::Encoded_Reg_##Name##d;                                 \
   }                                                                            \
   static constexpr GPRRegister Encoded_GPR_##Name##q() {                       \
     return GPRRegister::Encoded_Reg_##Name##d;                                 \
   }                                                                            \
   static constexpr GPRRegister Encoded_GPR_##Name##d() {                       \
     return GPRRegister::Encoded_Reg_##Name##d;                                 \
   }                                                                            \
   static constexpr GPRRegister Encoded_GPR_##Name##w() {                       \
     return GPRRegister::Encoded_Reg_##Name##d;                                 \
   }                                                                            \
   static constexpr GPRRegister Encoded_GPR_##Name##l() {                       \
     return GPRRegister::Encoded_Reg_##Name##d;                                 \
+  }                                                                            \
+  static constexpr ByteRegister Encoded_Bytereg_##Name() {                     \
+    return ByteRegister::Encoded_8_Reg_##Name##l;                              \
   }
 #define XmmRegAliases(Name)                                                    \
   static constexpr XmmRegister Encoded_Xmm_##Name() {                          \
     return XmmRegister::Encoded_Reg_##Name;                                    \
   }
   LegacyRegAliases(r0, rsp, esp, sp, spl);
   LegacyRegAliases(r1, rax, eax, ax, al);
   LegacyRegAliases(r2, rbx, ebx, bx, bl);
   LegacyRegAliases(r3, rcx, ecx, cx, cl);
   LegacyRegAliases(r4, rdx, edx, dx, dl);
@@ skipping 989 matching lines @@
 
   bool NeedsEpilogue;
   uint32_t NumAllocatedDwords;
 };
 
 } // end of namespace Test
 } // end of namespace X8664
 } // end of namespace Ice
 
 #endif // ASSEMBLERX8664_TESTUTIL_H_