Subzero. Code organization.

src/IceTargetLoweringX8664.h

 //===- subzero/src/IceTargetLoweringX8664.h - lowering for x86-64 -*- C++ -*-=//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// \brief Declares the TargetLoweringX8664 class, which implements the
 /// TargetLowering interface for the X86 64-bit architecture.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef SUBZERO_SRC_ICETARGETLOWERINGX8664_H
 #define SUBZERO_SRC_ICETARGETLOWERINGX8664_H
 
 #include "IceAssemblerX8664.h"
 #include "IceCfg.h"
 #include "IceGlobalContext.h"
 #include "IceInstX8664.h"
 #include "IceTargetLowering.h"
+#define X86NAMESPACE X8664
+#include "IceTargetLoweringX86Base.h"
+#undef X86NAMESPACE
 #include "IceTargetLoweringX8664Traits.h"
-#include "IceTargetLoweringX86Base.h"
 
 namespace Ice {
+namespace X8664 {
 
-class TargetX8664 final
-    : public ::Ice::X86Internal::TargetX86Base<TargetX8664> {
+class TargetX8664 final : public X8664::TargetX86Base<X8664::Traits> {
   TargetX8664() = delete;
   TargetX8664(const TargetX8664 &) = delete;
   TargetX8664 &operator=(const TargetX8664 &) = delete;
 
   void emitJumpTable(const Cfg *Func,
                      const InstJumpTable *JumpTable) const override;
 
 public:
   ~TargetX8664() = default;
 
   static std::unique_ptr<::Ice::TargetLowering> create(Cfg *Func) {
     return makeUnique<TargetX8664>(Func);
   }
 
   std::unique_ptr<::Ice::Assembler> createAssembler() const override {
     return makeUnique<X8664::AssemblerX8664>();
   }
 
 protected:
   void lowerCall(const InstCall *Instr) override;
   void lowerArguments() override;
   void lowerRet(const InstRet *Inst) override;
   void addProlog(CfgNode *Node) override;
   void addEpilog(CfgNode *Node) override;
 
 private:
   ENABLE_MAKE_UNIQUE;
-  friend class ::Ice::X86Internal::TargetX86Base<TargetX8664>;
+  friend class X8664::TargetX86Base<X8664::Traits>;
 
   explicit TargetX8664(Cfg *Func)
-      : ::Ice::X86Internal::TargetX86Base<TargetX8664>(Func) {}
+      : ::Ice::X8664::TargetX86Base<X8664::Traits>(Func) {}
 
   Operand *createNaClReadTPSrcOperand() {
     Variable *TDB = makeReg(IceType_i32);
     InstCall *Call = makeHelperCall(H_call_read_tp, TDB, 0);
     lowerCall(Call);
     return TDB;
   }
 };
 
 class TargetDataX8664 : public TargetDataLowering {
@@ skipping 32 matching lines @@
   static std::unique_ptr<TargetHeaderLowering> create(GlobalContext *Ctx) {
     return makeUnique<TargetHeaderX8664>(Ctx);
   }
 
 private:
   ENABLE_MAKE_UNIQUE;
 
   explicit TargetHeaderX8664(GlobalContext *Ctx) : TargetHeaderLowering(Ctx) {}
 };
 
+} // end of namespace X8664
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICETARGETLOWERINGX8664_H