Subzero. Code organization.

src/IceTargetLoweringX8632Traits.h

 //===- subzero/src/IceTargetLoweringX8632Traits.h - x86-32 traits -*- C++ -*-=//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 12 matching lines @@
 #include "IceOperand.h"
 #include "IceRegistersX8632.h"
 #include "IceTargetLowering.h"
 #include "IceTargetLoweringX8632.def"
 #include "IceTargetLoweringX86RegClass.h"
 
 #include <array>
 
 namespace Ice {
 
+namespace X8632 {
+using namespace ::Ice::X86;
+
+template <class Machine> struct Insts;
+template <class Machine> class TargetX86Base;
+template <class Machine> class AssemblerX86Base;
+
 class TargetX8632;
 
-namespace X8632 {
-class AssemblerX8632;
-} // end of namespace X8632
-
-namespace X86Internal {
-
-template <class Machine> struct Insts;
-template <class Machine> struct MachineTraits;
-template <class Machine> class TargetX86Base;
-
-template <> struct MachineTraits<TargetX8632> {
+struct TargetX8632Traits {
   //----------------------------------------------------------------------------
   //     ______  ______  __    __
   //    /\  __ \/\  ___\/\ "-./  \
   //    \ \  __ \ \___  \ \ \-./\ \
   //     \ \_\ \_\/\_____\ \_\ \ \_\
   //      \/_/\/_/\/_____/\/_/  \/_/
   //
   //----------------------------------------------------------------------------
+  static constexpr ::Ice::Assembler::AssemblerKind AsmKind =
+      ::Ice::Assembler::Asm_X8632;
+
   static constexpr bool Is64Bit = false;
   static constexpr bool HasPopa = true;
   static constexpr bool HasPusha = true;
   static constexpr bool UsesX87 = true;
   static constexpr ::Ice::RegX8632::GPRRegister Last8BitGPR =
       ::Ice::RegX8632::GPRRegister::Encoded_Reg_ebx;
 
   enum ScaleFactor { TIMES_1 = 0, TIMES_2 = 1, TIMES_4 = 2, TIMES_8 = 3 };
 
   using GPRRegister = ::Ice::RegX8632::GPRRegister;
@@ skipping 100 matching lines @@
 
     /// Returns whether or not this operand is really the given register in
     /// disguise. Used from the assembler to generate better encodings.
     bool IsRegister(GPRRegister reg) const {
       return ((encoding_[0] & 0xF8) ==
               0xC0) // Addressing mode is register only.
              &&
              ((encoding_[0] & 0x07) == reg); // Register codes match.
     }
 
-    template <class> friend class AssemblerX86Base;
+    friend class AssemblerX86Base<TargetX8632Traits>;
   };
 
   class Address : public Operand {
     Address() = delete;
 
   public:
     Address(const Address &other) : Operand(other) {}
 
     Address &operator=(const Address &other) {
       Operand::operator=(other);
@@ skipping 560 matching lines @@
   static const size_t TableTypeX8632AttributesSize;
 
   //----------------------------------------------------------------------------
   //      __  __   __  ______  ______
   //    /\ \/\ "-.\ \/\  ___\/\__  _\
   //    \ \ \ \ \-.  \ \___  \/_/\ \/
   //     \ \_\ \_\\"\_\/\_____\ \ \_\
   //      \/_/\/_/ \/_/\/_____/  \/_/
   //
   //----------------------------------------------------------------------------
-  using Insts = ::Ice::X86Internal::Insts<TargetX8632>;
+  using Traits = TargetX8632Traits;
+  using Insts = ::Ice::X8632::Insts<Traits>;
 
-  using TargetLowering = ::Ice::X86Internal::TargetX86Base<TargetX8632>;
-  using Assembler = X8632::AssemblerX8632;
+  using TargetLowering = ::Ice::X8632::TargetX86Base<Traits>;
+  using ConcreteTarget = ::Ice::X8632::TargetX8632;
+  using Assembler = ::Ice::X8632::AssemblerX86Base<Traits>;
 
   /// X86Operand extends the Operand hierarchy. Its subclasses are X86OperandMem
   /// and VariableSplit.
   class X86Operand : public ::Ice::Operand {
     X86Operand() = delete;
     X86Operand(const X86Operand &) = delete;
     X86Operand &operator=(const X86Operand &) = delete;
 
   public:
     enum OperandKindX8632 { k__Start = ::Ice::Operand::kTarget, kMem, kSplit };
@@ skipping 156 matching lines @@
     const char *PackString;  // b, w, d, or <blank>
     const char *WidthString; // b, w, l, q, or <blank>
     const char *FldString;   // s, l, or <blank>
   } TypeAttributes[];
 
   static const char *InstSegmentRegNames[];
 
   static uint8_t InstSegmentPrefixes[];
 };
 
-} // end of namespace X86Internal
-
-namespace X8632 {
-using Traits = ::Ice::X86Internal::MachineTraits<TargetX8632>;
+using Traits = ::Ice::X8632::TargetX8632Traits;
 } // end of namespace X8632
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICETARGETLOWERINGX8632TRAITS_H