Code cleanup: moving poly/ into xenia/base/

src/xenia/cpu/compiler/compiler.h

@@ -13,8 +13,8 @@
 #include <memory>
 #include <vector>
 
+#include "xenia/base/arena.h"
 #include "xenia/cpu/hir/hir_builder.h"
-#include "poly/arena.h"
 
 namespace xe {
 namespace cpu {
@@ -34,7 +34,7 @@ class Compiler {
   ~Compiler();
 
   Runtime* runtime() const { return runtime_; }
-  poly::Arena* scratch_arena() { return &scratch_arena_; }
+  Arena* scratch_arena() { return &scratch_arena_; }
 
   void AddPass(std::unique_ptr<CompilerPass> pass);
 
@@ -44,7 +44,7 @@ class Compiler {
 
  private:
   Runtime* runtime_;
-  poly::Arena scratch_arena_;
+  Arena scratch_arena_;
 
   std::vector<std::unique_ptr<CompilerPass>> passes_;
 };

src/xenia/cpu/compiler/compiler_pass.cc

@@ -25,7 +25,7 @@ int CompilerPass::Initialize(Compiler* compiler) {
   return 0;
 }
 
-poly::Arena* CompilerPass::scratch_arena() const {
+Arena* CompilerPass::scratch_arena() const {
   return compiler_->scratch_arena();
 }
 

src/xenia/cpu/compiler/compiler_pass.h

@@ -10,8 +10,8 @@
 #ifndef XENIA_COMPILER_COMPILER_PASS_H_
 #define XENIA_COMPILER_COMPILER_PASS_H_
 
+#include "xenia/base/arena.h"
 #include "xenia/cpu/hir/hir_builder.h"
-#include "poly/arena.h"
 
 namespace xe {
 namespace cpu {
@@ -35,7 +35,7 @@ class CompilerPass {
   virtual int Run(hir::HIRBuilder* builder) = 0;
 
  protected:
-  poly::Arena* scratch_arena() const;
+  Arena* scratch_arena() const;
 
  protected:
   Runtime* runtime_;

src/xenia/cpu/compiler/passes/constant_propagation_pass.cc

@@ -9,7 +9,7 @@
 
 #include "xenia/cpu/compiler/passes/constant_propagation_pass.h"
 
-#include "poly/assert.h"
+#include "xenia/base/assert.h"
 #include "xenia/cpu/function.h"
 #include "xenia/cpu/runtime.h"
 #include "xenia/profiling.h"

src/xenia/cpu/compiler/passes/context_promotion_pass.h

@@ -10,7 +10,7 @@
 #ifndef XENIA_COMPILER_PASSES_CONTEXT_PROMOTION_PASS_H_
 #define XENIA_COMPILER_PASSES_CONTEXT_PROMOTION_PASS_H_
 
-#include "poly/platform.h"
+#include "xenia/base/platform.h"
 #include "xenia/cpu/compiler/compiler_pass.h"
 
 #if XE_COMPILER_MSVC

src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc

@@ -9,8 +9,8 @@
 
 #include "xenia/cpu/compiler/passes/data_flow_analysis_pass.h"
 
-#include "poly/assert.h"
-#include "poly/platform.h"
+#include "xenia/base/assert.h"
+#include "xenia/base/platform.h"
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
 #include "xenia/cpu/runtime.h"

src/xenia/cpu/compiler/passes/register_allocation_pass.cc

@@ -11,9 +11,9 @@
 
 #include <algorithm>
 
-#include "poly/assert.h"
-#include "poly/math.h"
-#include "xenia/logging.h"
+#include "xenia/base/assert.h"
+#include "xenia/base/logging.h"
+#include "xenia/base/math.h"
 #include "xenia/profiling.h"
 
 namespace xe {
@@ -61,7 +61,7 @@ RegisterAllocationPass::RegisterAllocationPass(const MachineInfo* machine_info)
 }
 
 RegisterAllocationPass::~RegisterAllocationPass() {
-  for (size_t n = 0; n < poly::countof(usage_sets_.all_sets); n++) {
+  for (size_t n = 0; n < xe::countof(usage_sets_.all_sets); n++) {
     if (!usage_sets_.all_sets[n]) {
       break;
     }
@@ -175,7 +175,7 @@ int RegisterAllocationPass::Run(HIRBuilder* builder) {
 void RegisterAllocationPass::DumpUsage(const char* name) {
 #if 0
   fprintf(stdout, "\n%s:\n", name);
-  for (size_t i = 0; i < poly::countof(usage_sets_.all_sets); ++i) {
+  for (size_t i = 0; i < xe::countof(usage_sets_.all_sets); ++i) {
     auto usage_set = usage_sets_.all_sets[i];
     if (usage_set) {
       fprintf(stdout, "set %s:\n", usage_set->set->name);
@@ -194,7 +194,7 @@ void RegisterAllocationPass::DumpUsage(const char* name) {
 }
 
 void RegisterAllocationPass::PrepareBlockState() {
-  for (size_t i = 0; i < poly::countof(usage_sets_.all_sets); ++i) {
+  for (size_t i = 0; i < xe::countof(usage_sets_.all_sets); ++i) {
     auto usage_set = usage_sets_.all_sets[i];
     if (usage_set) {
       usage_set->availability.set();
@@ -205,7 +205,7 @@ void RegisterAllocationPass::PrepareBlockState() {
 }
 
 void RegisterAllocationPass::AdvanceUses(Instr* instr) {
-  for (size_t i = 0; i < poly::countof(usage_sets_.all_sets); ++i) {
+  for (size_t i = 0; i < xe::countof(usage_sets_.all_sets); ++i) {
     auto usage_set = usage_sets_.all_sets[i];
     if (!usage_set) {
       break;
@@ -310,7 +310,7 @@ bool RegisterAllocationPass::TryAllocateRegister(Value* value) {
   // Find the first free register, if any.
   // We have to ensure it's a valid one (in our count).
   uint32_t first_unused = 0;
-  bool none_used = poly::bit_scan_forward(
+  bool none_used = xe::bit_scan_forward(
       static_cast<uint32_t>(usage_set->availability.to_ulong()), &first_unused);
   if (none_used && first_unused < usage_set->count) {
     // Available! Use it!

src/xenia/cpu/compiler/passes/validation_pass.cc

@@ -9,7 +9,7 @@
 
 #include "xenia/cpu/compiler/passes/validation_pass.h"
 
-#include "poly/assert.h"
+#include "xenia/base/assert.h"
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
 #include "xenia/cpu/runtime.h"

src/xenia/cpu/compiler/passes/value_reduction_pass.cc

@@ -9,7 +9,7 @@
 
 #include "xenia/cpu/compiler/passes/value_reduction_pass.h"
 
-#include "poly/platform.h"
+#include "xenia/base/platform.h"
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
 #include "xenia/cpu/runtime.h"