Subzero. Code organization.

unittest/AssemblerX8632/TestUtil.h

 //===- subzero/unittest/unittest/AssemblerX8632/TestUtil.h ------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Utility classes for testing the X8632 Assembler.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef ASSEMBLERX8632_TESTUTIL_H_
 #define ASSEMBLERX8632_TESTUTIL_H_
 
 #include "IceAssemblerX8632.h"
+#include "IceDefs.h"
 
 #include "gtest/gtest.h"
 
 #include <cassert>
 #include <sys/mman.h>
 
 namespace Ice {
 namespace X8632 {
 namespace Test {
 
 class AssemblerX8632TestBase : public ::testing::Test {
 protected:
   using Address = AssemblerX8632::Traits::Address;
   using Cond = AssemblerX8632::Traits::Cond;
   using GPRRegister = AssemblerX8632::Traits::GPRRegister;
   using ByteRegister = AssemblerX8632::Traits::ByteRegister;
-  using Label = ::Ice::X86Internal::Label;
+  using Label = ::Ice::X8632::Label;
   using Traits = AssemblerX8632::Traits;
   using XmmRegister = AssemblerX8632::Traits::XmmRegister;
   using X87STRegister = AssemblerX8632::Traits::X87STRegister;
 
   AssemblerX8632TestBase() { reset(); }
 
-  void reset() { Assembler.reset(new AssemblerX8632()); }
+  void reset() { Assembler = makeUnique<AssemblerX8632>(); }
 
   AssemblerX8632 *assembler() const { return Assembler.get(); }
 
   size_t codeBytesSize() const { return Assembler->getBufferView().size(); }
 
   const uint8_t *codeBytes() const {
     return static_cast<const uint8_t *>(
         static_cast<const void *>(Assembler->getBufferView().data()));
   }
 
@@ skipping 788 matching lines @@
 
   bool NeedsEpilogue;
   uint32_t NumAllocatedDwords;
 };
 
 } // end of namespace Test
 } // end of namespace X8632
 } // end of namespace Ice
 
 #endif // ASSEMBLERX8632_TESTUTIL_H_