Code cleanup: removing poly.h

src/poly/cxx_compat.h

@@ -12,6 +12,7 @@
 
 #include <memory>
 
+#include "poly/platform.h"
 
 // C++11 thread local storage.
 // http://en.cppreference.com/w/cpp/language/storage_duration

src/poly/poly.h

@@ -1,28 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2014 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-#ifndef POLY_POLY_H_
-#define POLY_POLY_H_
-
-#include "poly/assert.h"
-#include "poly/atomic.h"
-#include "poly/byte_order.h"
-#include "poly/cxx_compat.h"
-#include "poly/debugging.h"
-#include "poly/mapped_memory.h"
-#include "poly/math.h"
-#include "poly/memory.h"
-#include "poly/platform.h"
-#include "poly/string.h"
-#include "poly/threading.h"
-#include "poly/vec128.h"
-
-namespace poly {}  // namespace poly
-
-#endif  // POLY_POLY_H_

src/poly/sources.gypi

@@ -18,7 +18,6 @@
     'memory.cc',
     'memory.h',
     'platform.h',
-    'poly.h',
     'reset_scope.h',
     'string.cc',
     'string.h',

src/poly/vec128.h

@@ -12,6 +12,9 @@
 
 #include <cstddef>
 
+#include "poly/math.h"
+#include "poly/platform.h"
+
 namespace poly {
 
 // The first rule of vector programming is to only rely on exact positions

src/xenia/apu/audio_system.cc

@@ -9,7 +9,7 @@
 
 #include "xenia/apu/audio_system.h"
 
-#include "poly/poly.h"
+#include "poly/math.h"
 #include "xenia/apu/audio_driver.h"
 #include "xenia/emulator.h"
 #include "xenia/cpu/processor.h"

src/xenia/cpu/backend/x64/x64_code_cache_win.cc

@@ -9,7 +9,8 @@
 
 #include "xenia/cpu/backend/x64/x64_code_cache.h"
 
-#include "poly/poly.h"
+#include "poly/assert.h"
+#include "poly/math.h"
 #include "xenia/logging.h"
 
 namespace xe {

src/xenia/cpu/backend/x64/x64_emitter.cc

@@ -9,6 +9,8 @@
 
 #include "xenia/cpu/backend/x64/x64_emitter.h"
 
+#include "poly/assert.h"
+#include "poly/math.h"
 #include "poly/vec128.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/backend/x64/x64_code_cache.h"

src/xenia/cpu/backend/x64/x64_sequences.cc

@@ -24,6 +24,8 @@
 
 #include "xenia/cpu/backend/x64/x64_sequences.h"
 
+#include "poly/assert.h"
+#include "poly/threading.h"
 #include "xenia/cpu/backend/x64/x64_emitter.h"
 #include "xenia/cpu/backend/x64/x64_tracers.h"
 #include "xenia/cpu/hir/hir_builder.h"

src/xenia/cpu/backend/x64/x64_tracers.cc

@@ -9,6 +9,7 @@
 
 #include "xenia/cpu/backend/x64/x64_tracers.h"
 
+#include "poly/vec128.h"
 #include "xenia/cpu/backend/x64/x64_emitter.h"
 #include "xenia/cpu/runtime.h"
 #include "xenia/cpu/thread_state.h"

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

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

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

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

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

@@ -11,6 +11,8 @@
 
 #include <algorithm>
 
+#include "poly/assert.h"
+#include "poly/math.h"
 #include "xenia/logging.h"
 #include "xenia/profiling.h"
 

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

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

src/xenia/cpu/entry_table.cc

@@ -9,7 +9,7 @@
 
 #include "xenia/cpu/entry_table.h"
 
-#include "poly/poly.h"
+#include "poly/threading.h"
 #include "xenia/profiling.h"
 
 namespace xe {

src/xenia/cpu/frontend/ppc_context.h

@@ -10,7 +10,8 @@
 #ifndef XENIA_FRONTEND_PPC_CONTEXT_H_
 #define XENIA_FRONTEND_PPC_CONTEXT_H_
 
-#include "poly/poly.h"
+#include <cstdint>
+
 #include "poly/vec128.h"
 
 namespace xe {

src/xenia/cpu/frontend/ppc_disasm.cc

@@ -9,7 +9,8 @@
 
 #include "xenia/cpu/frontend/ppc_disasm.h"
 
-#include "poly/poly.h"
+#include "poly/assert.h"
+#include "poly/math.h"
 #include "poly/string_buffer.h"
 
 namespace xe {

src/xenia/cpu/frontend/ppc_emit_altivec.cc

@@ -9,6 +9,7 @@
 
 #include "xenia/cpu/frontend/ppc_emit-private.h"
 
+#include "poly/assert.h"
 #include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/frontend/ppc_hir_builder.h"
 

src/xenia/cpu/frontend/ppc_emit_alu.cc

@@ -9,6 +9,7 @@
 
 #include "xenia/cpu/frontend/ppc_emit-private.h"
 
+#include "poly/assert.h"
 #include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/frontend/ppc_hir_builder.h"
 

src/xenia/cpu/frontend/ppc_emit_control.cc

@@ -9,6 +9,7 @@
 
 #include "xenia/cpu/frontend/ppc_emit-private.h"
 
+#include "poly/assert.h"
 #include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/frontend/ppc_hir_builder.h"
 

src/xenia/cpu/frontend/ppc_emit_fpu.cc

@@ -9,6 +9,7 @@
 
 #include "xenia/cpu/frontend/ppc_emit-private.h"
 
+#include "poly/assert.h"
 #include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/frontend/ppc_hir_builder.h"
 

src/xenia/cpu/frontend/ppc_emit_memory.cc

@@ -9,6 +9,7 @@
 
 #include "xenia/cpu/frontend/ppc_emit-private.h"
 
+#include "poly/assert.h"
 #include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/frontend/ppc_hir_builder.h"
 

src/xenia/cpu/frontend/ppc_hir_builder.cc

@@ -9,6 +9,8 @@
 
 #include "xenia/cpu/frontend/ppc_hir_builder.h"
 
+#include "poly/byte_order.h"
+#include "poly/memory.h"
 #include "xenia/cpu/cpu-private.h"
 #include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/frontend/ppc_disasm.h"

src/xenia/cpu/frontend/ppc_instr.cc

@@ -12,9 +12,10 @@
 #include <sstream>
 #include <vector>
 
-#include "xenia/cpu/frontend/ppc_instr_tables.h"
-#include "poly/poly.h"
+#include "poly/assert.h"
+#include "poly/math.h"
 #include "poly/string_buffer.h"
+#include "xenia/cpu/frontend/ppc_instr_tables.h"
 
 namespace xe {
 namespace cpu {

src/xenia/cpu/frontend/ppc_instr_tables.h

@@ -12,9 +12,9 @@
 
 #include <cmath>
 
-#include "xenia/cpu/frontend/ppc_instr.h"
-#include "poly/poly.h"
+#include "poly/math.h"
 #include "poly/string_buffer.h"
+#include "xenia/cpu/frontend/ppc_instr.h"
 
 namespace xe {
 namespace cpu {

src/xenia/cpu/frontend/ppc_translator.cc

@@ -9,6 +9,10 @@
 
 #include "xenia/cpu/frontend/ppc_translator.h"
 
+#include "poly/assert.h"
+#include "poly/byte_order.h"
+#include "poly/memory.h"
+#include "poly/reset_scope.h"
 #include "xenia/cpu/compiler/compiler_passes.h"
 #include "xenia/cpu/cpu-private.h"
 #include "xenia/cpu/frontend/ppc_disasm.h"
@@ -17,7 +21,6 @@
 #include "xenia/cpu/frontend/ppc_instr.h"
 #include "xenia/cpu/frontend/ppc_scanner.h"
 #include "xenia/cpu/runtime.h"
-#include "poly/reset_scope.h"
 #include "xenia/profiling.h"
 
 namespace xe {

src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc

@@ -8,7 +8,7 @@
  */
 
 #include "poly/main.h"
-#include "poly/poly.h"
+#include "poly/math.h"
 #include "xenia/cpu/cpu.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/frontend/ppc_context.h"

src/xenia/cpu/hir/block.cc

@@ -9,6 +9,7 @@
 
 #include "xenia/cpu/hir/block.h"
 
+#include "poly/assert.h"
 #include "xenia/cpu/hir/instr.h"
 
 namespace xe {

src/xenia/cpu/hir/hir_builder.cc

@@ -9,6 +9,7 @@
 
 #include "xenia/cpu/hir/hir_builder.h"
 
+#include "poly/assert.h"
 #include "xenia/cpu/hir/block.h"
 #include "xenia/cpu/hir/instr.h"
 #include "xenia/cpu/hir/label.h"

src/xenia/cpu/hir/value.cc

@@ -11,6 +11,10 @@
 
 #include <cmath>
 
+#include "poly/assert.h"
+#include "poly/byte_order.h"
+#include "poly/math.h"
+
 namespace xe {
 namespace cpu {
 namespace hir {

src/xenia/cpu/hir/value.h

@@ -10,11 +10,11 @@
 #ifndef XENIA_HIR_VALUE_H_
 #define XENIA_HIR_VALUE_H_
 
+#include "poly/arena.h"
+#include "poly/assert.h"
+#include "poly/vec128.h"
 #include "xenia/cpu/backend/machine_info.h"
 #include "xenia/cpu/hir/opcodes.h"
-#include "poly/arena.h"
-#include "poly/poly.h"
-#include "poly/vec128.h"
 
 namespace xe {
 namespace cpu {

src/xenia/cpu/mmio_handler.cc

@@ -9,7 +9,9 @@
 
 #include "xenia/cpu/mmio_handler.h"
 
-#include "poly/poly.h"
+#include "poly/assert.h"
+#include "poly/byte_order.h"
+#include "poly/math.h"
 
 namespace BE {
 #include <beaengine/BeaEngine.h>

src/xenia/cpu/mmio_handler_mac.cc

@@ -14,7 +14,6 @@
 
 #include <thread>
 
-#include "poly/poly.h"
 #include "xenia/logging.h"
 
 // Mach internal function, not defined in any header.

src/xenia/cpu/module.cc

@@ -12,8 +12,8 @@
 #include <fstream>
 #include <sstream>
 
+#include "poly/threading.h"
 #include "xenia/cpu/runtime.h"
-#include "poly/poly.h"
 #include "xenia/profiling.h"
 
 namespace xe {

src/xenia/cpu/processor.cc

@@ -9,6 +9,9 @@
 
 #include "xenia/cpu/processor.h"
 
+#include "poly/atomic.h"
+#include "poly/byte_order.h"
+#include "poly/memory.h"
 #include "xenia/cpu/cpu-private.h"
 #include "xenia/cpu/export_resolver.h"
 #include "xenia/cpu/runtime.h"

src/xenia/cpu/runtime.cc

@@ -11,7 +11,7 @@
 
 #include <gflags/gflags.h>
 
-#include "poly/poly.h"
+#include "poly/assert.h"
 #include "xdb/protocol.h"
 #include "xenia/cpu/frontend/ppc_frontend.h"
 #include "xenia/cpu/module.h"

src/xenia/cpu/test/util.h

@@ -10,14 +10,13 @@
 #ifndef XENIA_TEST_UTIL_H_
 #define XENIA_TEST_UTIL_H_
 
+#include "poly/main.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/cpu.h"
 #include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/frontend/ppc_frontend.h"
 #include "xenia/cpu/hir/hir_builder.h"
 #include "xenia/cpu/test_module.h"
-#include "poly/main.h"
-#include "poly/poly.h"
 
 #include "third_party/catch/single_include/catch.hpp"
 

src/xenia/cpu/test/xe-cpu-hir-test.cc

@@ -10,6 +10,8 @@
 #define CATCH_CONFIG_RUNNER
 #include "third_party/catch/single_include/catch.hpp"
 
+#include "poly/debugging.h"
+#include "poly/string.h"
 #include "xenia/cpu/test/util.h"
 
 namespace xe {

src/xenia/cpu/test/xe-cpu-sandbox.cc

@@ -7,13 +7,12 @@
  ******************************************************************************
  */
 
+#include "poly/main.h"
 #include "xenia/cpu/cpu.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/frontend/ppc_frontend.h"
 #include "xenia/cpu/raw_module.h"
-#include "poly/main.h"
-#include "poly/poly.h"
 
 #include <gflags/gflags.h>
 

src/xenia/cpu/test_module.cc

@@ -9,11 +9,12 @@
 
 #include "xenia/cpu/test_module.h"
 
-#include "xenia/cpu/compiler/compiler_passes.h"
-#include "xenia/cpu/runtime.h"
+#include "poly/assert.h"
 #include "poly/platform.h"
 #include "poly/reset_scope.h"
 #include "poly/string.h"
+#include "xenia/cpu/compiler/compiler_passes.h"
+#include "xenia/cpu/runtime.h"
 
 namespace xe {
 namespace cpu {

src/xenia/cpu/thread_state.cc

@@ -9,6 +9,8 @@
 
 #include "xenia/cpu/thread_state.h"
 
+#include "poly/assert.h"
+#include "poly/threading.h"
 #include "xdb/protocol.h"
 #include "xenia/cpu/runtime.h"
 

src/xenia/cpu/xex_module.cc

@@ -11,7 +11,9 @@
 
 #include <algorithm>
 
+#include "poly/byte_order.h"
 #include "poly/math.h"
+#include "poly/memory.h"
 #include "xenia/cpu/cpu-private.h"
 #include "xenia/cpu/export_resolver.h"
 #include "xenia/cpu/runtime.h"

src/xenia/emulator.cc

@@ -9,7 +9,8 @@
 
 #include "xenia/emulator.h"
 
-#include "poly/poly.h"
+#include "poly/assert.h"
+#include "poly/string.h"
 #include "xdb/protocol.h"
 #include "xenia/apu/apu.h"
 #include "xenia/cpu/cpu.h"

src/xenia/gpu/graphics_system.cc

@@ -9,7 +9,7 @@
 
 #include "xenia/gpu/graphics_system.h"
 
-#include "poly/poly.h"
+#include "poly/math.h"
 #include "xenia/cpu/processor.h"
 #include "xenia/gpu/gpu-private.h"
 #include "xenia/logging.h"

src/xenia/kernel/kernel_state.cc

@@ -11,6 +11,8 @@
 
 #include <gflags/gflags.h>
 
+#include "poly/assert.h"
+#include "poly/string.h"
 #include "xenia/emulator.h"
 #include "xenia/kernel/dispatcher.h"
 #include "xenia/kernel/xam_module.h"

src/xenia/kernel/objects/xthread.cc

@@ -9,7 +9,8 @@
 
 #include "xenia/kernel/objects/xthread.h"
 
-#include "poly/poly.h"
+#include "poly/math.h"
+#include "poly/threading.h"
 #include "xdb/protocol.h"
 #include "xenia/cpu/cpu.h"
 #include "xenia/kernel/native_list.h"

src/xenia/kernel/xboxkrnl_rtl.cc

@@ -9,6 +9,9 @@
 
 #include "xenia/kernel/xboxkrnl_rtl.h"
 
+#include <algorithm>
+
+#include "poly/atomic.h"
 #include "poly/string.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/xboxkrnl_private.h"

src/xenia/kernel/xboxkrnl_threading.cc

@@ -7,6 +7,7 @@
  ******************************************************************************
  */
 
+#include "poly/atomic.h"
 #include "xenia/cpu/processor.h"
 #include "xenia/kernel/dispatcher.h"
 #include "xenia/kernel/kernel_state.h"