From 99816056be753294b7b822b842061915bf7ec130 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Sat, 2 May 2015 02:29:26 -0700 Subject: [PATCH] Code cleanup: removing poly.h --- src/poly/cxx_compat.h | 1 + src/poly/poly.h | 28 ------------------- src/poly/sources.gypi | 1 - src/poly/vec128.h | 3 ++ src/xenia/apu/audio_system.cc | 2 +- .../cpu/backend/x64/x64_code_cache_win.cc | 3 +- src/xenia/cpu/backend/x64/x64_emitter.cc | 2 ++ src/xenia/cpu/backend/x64/x64_sequences.cc | 2 ++ src/xenia/cpu/backend/x64/x64_tracers.cc | 1 + .../passes/constant_propagation_pass.cc | 1 + .../passes/data_flow_analysis_pass.cc | 1 + .../passes/register_allocation_pass.cc | 2 ++ .../cpu/compiler/passes/validation_pass.cc | 1 + src/xenia/cpu/entry_table.cc | 2 +- src/xenia/cpu/frontend/ppc_context.h | 3 +- src/xenia/cpu/frontend/ppc_disasm.cc | 3 +- src/xenia/cpu/frontend/ppc_emit_altivec.cc | 1 + src/xenia/cpu/frontend/ppc_emit_alu.cc | 1 + src/xenia/cpu/frontend/ppc_emit_control.cc | 1 + src/xenia/cpu/frontend/ppc_emit_fpu.cc | 1 + src/xenia/cpu/frontend/ppc_emit_memory.cc | 1 + src/xenia/cpu/frontend/ppc_hir_builder.cc | 2 ++ src/xenia/cpu/frontend/ppc_instr.cc | 5 ++-- src/xenia/cpu/frontend/ppc_instr_tables.h | 4 +-- src/xenia/cpu/frontend/ppc_translator.cc | 5 +++- .../cpu/frontend/test/xe-cpu-ppc-test.cc | 2 +- src/xenia/cpu/hir/block.cc | 1 + src/xenia/cpu/hir/hir_builder.cc | 1 + src/xenia/cpu/hir/value.cc | 4 +++ src/xenia/cpu/hir/value.h | 6 ++-- src/xenia/cpu/mmio_handler.cc | 4 ++- src/xenia/cpu/mmio_handler_mac.cc | 1 - src/xenia/cpu/module.cc | 2 +- src/xenia/cpu/processor.cc | 3 ++ src/xenia/cpu/runtime.cc | 2 +- src/xenia/cpu/test/util.h | 3 +- src/xenia/cpu/test/xe-cpu-hir-test.cc | 2 ++ src/xenia/cpu/test/xe-cpu-sandbox.cc | 3 +- src/xenia/cpu/test_module.cc | 5 ++-- src/xenia/cpu/thread_state.cc | 2 ++ src/xenia/cpu/xex_module.cc | 2 ++ src/xenia/emulator.cc | 3 +- src/xenia/gpu/graphics_system.cc | 2 +- src/xenia/kernel/kernel_state.cc | 2 ++ src/xenia/kernel/objects/xthread.cc | 3 +- src/xenia/kernel/xboxkrnl_rtl.cc | 3 ++ src/xenia/kernel/xboxkrnl_threading.cc | 1 + 47 files changed, 78 insertions(+), 56 deletions(-) delete mode 100644 src/poly/poly.h diff --git a/src/poly/cxx_compat.h b/src/poly/cxx_compat.h index 50f9b7a19..e34b6679b 100644 --- a/src/poly/cxx_compat.h +++ b/src/poly/cxx_compat.h @@ -12,6 +12,7 @@ #include +#include "poly/platform.h" // C++11 thread local storage. // http://en.cppreference.com/w/cpp/language/storage_duration diff --git a/src/poly/poly.h b/src/poly/poly.h deleted file mode 100644 index bbcda3190..000000000 --- a/src/poly/poly.h +++ /dev/null @@ -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_ diff --git a/src/poly/sources.gypi b/src/poly/sources.gypi index c57c4fb23..ee55cf04f 100644 --- a/src/poly/sources.gypi +++ b/src/poly/sources.gypi @@ -18,7 +18,6 @@ 'memory.cc', 'memory.h', 'platform.h', - 'poly.h', 'reset_scope.h', 'string.cc', 'string.h', diff --git a/src/poly/vec128.h b/src/poly/vec128.h index f317dfa54..7372a9e85 100644 --- a/src/poly/vec128.h +++ b/src/poly/vec128.h @@ -12,6 +12,9 @@ #include +#include "poly/math.h" +#include "poly/platform.h" + namespace poly { // The first rule of vector programming is to only rely on exact positions diff --git a/src/xenia/apu/audio_system.cc b/src/xenia/apu/audio_system.cc index 06fad509a..1138eb323 100644 --- a/src/xenia/apu/audio_system.cc +++ b/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" diff --git a/src/xenia/cpu/backend/x64/x64_code_cache_win.cc b/src/xenia/cpu/backend/x64/x64_code_cache_win.cc index 109e8f220..7ac255d23 100644 --- a/src/xenia/cpu/backend/x64/x64_code_cache_win.cc +++ b/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 { diff --git a/src/xenia/cpu/backend/x64/x64_emitter.cc b/src/xenia/cpu/backend/x64/x64_emitter.cc index 515c4f3d9..26ebd9bf1 100644 --- a/src/xenia/cpu/backend/x64/x64_emitter.cc +++ b/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" diff --git a/src/xenia/cpu/backend/x64/x64_sequences.cc b/src/xenia/cpu/backend/x64/x64_sequences.cc index 45db2ca96..c32efa336 100644 --- a/src/xenia/cpu/backend/x64/x64_sequences.cc +++ b/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" diff --git a/src/xenia/cpu/backend/x64/x64_tracers.cc b/src/xenia/cpu/backend/x64/x64_tracers.cc index 7d059e135..10f934b0e 100644 --- a/src/xenia/cpu/backend/x64/x64_tracers.cc +++ b/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" diff --git a/src/xenia/cpu/compiler/passes/constant_propagation_pass.cc b/src/xenia/cpu/compiler/passes/constant_propagation_pass.cc index 7c9ff52e1..043f34055 100644 --- a/src/xenia/cpu/compiler/passes/constant_propagation_pass.cc +++ b/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" diff --git a/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc b/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc index eba6a31b2..d8a901fd7 100644 --- a/src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc +++ b/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" diff --git a/src/xenia/cpu/compiler/passes/register_allocation_pass.cc b/src/xenia/cpu/compiler/passes/register_allocation_pass.cc index 62b5ad3f0..15b93c51c 100644 --- a/src/xenia/cpu/compiler/passes/register_allocation_pass.cc +++ b/src/xenia/cpu/compiler/passes/register_allocation_pass.cc @@ -11,6 +11,8 @@ #include +#include "poly/assert.h" +#include "poly/math.h" #include "xenia/logging.h" #include "xenia/profiling.h" diff --git a/src/xenia/cpu/compiler/passes/validation_pass.cc b/src/xenia/cpu/compiler/passes/validation_pass.cc index 5c05c98b8..5654ec998 100644 --- a/src/xenia/cpu/compiler/passes/validation_pass.cc +++ b/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" diff --git a/src/xenia/cpu/entry_table.cc b/src/xenia/cpu/entry_table.cc index ef296f838..b02334cd6 100644 --- a/src/xenia/cpu/entry_table.cc +++ b/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 { diff --git a/src/xenia/cpu/frontend/ppc_context.h b/src/xenia/cpu/frontend/ppc_context.h index 10e7547a1..336496e60 100644 --- a/src/xenia/cpu/frontend/ppc_context.h +++ b/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 + #include "poly/vec128.h" namespace xe { diff --git a/src/xenia/cpu/frontend/ppc_disasm.cc b/src/xenia/cpu/frontend/ppc_disasm.cc index b909d26df..cdb6bb3f1 100644 --- a/src/xenia/cpu/frontend/ppc_disasm.cc +++ b/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 { diff --git a/src/xenia/cpu/frontend/ppc_emit_altivec.cc b/src/xenia/cpu/frontend/ppc_emit_altivec.cc index 838f0569c..9909bc8c2 100644 --- a/src/xenia/cpu/frontend/ppc_emit_altivec.cc +++ b/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" diff --git a/src/xenia/cpu/frontend/ppc_emit_alu.cc b/src/xenia/cpu/frontend/ppc_emit_alu.cc index 708d96f2c..39e0e6fe1 100644 --- a/src/xenia/cpu/frontend/ppc_emit_alu.cc +++ b/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" diff --git a/src/xenia/cpu/frontend/ppc_emit_control.cc b/src/xenia/cpu/frontend/ppc_emit_control.cc index 3b5ef2776..ea508f11c 100644 --- a/src/xenia/cpu/frontend/ppc_emit_control.cc +++ b/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" diff --git a/src/xenia/cpu/frontend/ppc_emit_fpu.cc b/src/xenia/cpu/frontend/ppc_emit_fpu.cc index 25176858f..acc2ff41f 100644 --- a/src/xenia/cpu/frontend/ppc_emit_fpu.cc +++ b/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" diff --git a/src/xenia/cpu/frontend/ppc_emit_memory.cc b/src/xenia/cpu/frontend/ppc_emit_memory.cc index 33038c239..660ad795d 100644 --- a/src/xenia/cpu/frontend/ppc_emit_memory.cc +++ b/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" diff --git a/src/xenia/cpu/frontend/ppc_hir_builder.cc b/src/xenia/cpu/frontend/ppc_hir_builder.cc index c5366e131..2ff761b26 100644 --- a/src/xenia/cpu/frontend/ppc_hir_builder.cc +++ b/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" diff --git a/src/xenia/cpu/frontend/ppc_instr.cc b/src/xenia/cpu/frontend/ppc_instr.cc index cc57172fa..6802c91f3 100644 --- a/src/xenia/cpu/frontend/ppc_instr.cc +++ b/src/xenia/cpu/frontend/ppc_instr.cc @@ -12,9 +12,10 @@ #include #include -#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 { diff --git a/src/xenia/cpu/frontend/ppc_instr_tables.h b/src/xenia/cpu/frontend/ppc_instr_tables.h index b6264b024..b054ea072 100644 --- a/src/xenia/cpu/frontend/ppc_instr_tables.h +++ b/src/xenia/cpu/frontend/ppc_instr_tables.h @@ -12,9 +12,9 @@ #include -#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 { diff --git a/src/xenia/cpu/frontend/ppc_translator.cc b/src/xenia/cpu/frontend/ppc_translator.cc index 419169801..588b4629f 100644 --- a/src/xenia/cpu/frontend/ppc_translator.cc +++ b/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 { diff --git a/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc b/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc index 566d0f410..22fbde9e7 100644 --- a/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc +++ b/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" diff --git a/src/xenia/cpu/hir/block.cc b/src/xenia/cpu/hir/block.cc index 7233f21cd..14f612cb0 100644 --- a/src/xenia/cpu/hir/block.cc +++ b/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 { diff --git a/src/xenia/cpu/hir/hir_builder.cc b/src/xenia/cpu/hir/hir_builder.cc index f55d11bab..dc063fa8c 100644 --- a/src/xenia/cpu/hir/hir_builder.cc +++ b/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" diff --git a/src/xenia/cpu/hir/value.cc b/src/xenia/cpu/hir/value.cc index ee3fceced..cf2db6f6d 100644 --- a/src/xenia/cpu/hir/value.cc +++ b/src/xenia/cpu/hir/value.cc @@ -11,6 +11,10 @@ #include +#include "poly/assert.h" +#include "poly/byte_order.h" +#include "poly/math.h" + namespace xe { namespace cpu { namespace hir { diff --git a/src/xenia/cpu/hir/value.h b/src/xenia/cpu/hir/value.h index a3e4c95f9..9a2b93300 100644 --- a/src/xenia/cpu/hir/value.h +++ b/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 { diff --git a/src/xenia/cpu/mmio_handler.cc b/src/xenia/cpu/mmio_handler.cc index 750499018..dde7b0586 100644 --- a/src/xenia/cpu/mmio_handler.cc +++ b/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 diff --git a/src/xenia/cpu/mmio_handler_mac.cc b/src/xenia/cpu/mmio_handler_mac.cc index 3c9794fb3..e892add3f 100644 --- a/src/xenia/cpu/mmio_handler_mac.cc +++ b/src/xenia/cpu/mmio_handler_mac.cc @@ -14,7 +14,6 @@ #include -#include "poly/poly.h" #include "xenia/logging.h" // Mach internal function, not defined in any header. diff --git a/src/xenia/cpu/module.cc b/src/xenia/cpu/module.cc index 75aeb29a6..9faf69a31 100644 --- a/src/xenia/cpu/module.cc +++ b/src/xenia/cpu/module.cc @@ -12,8 +12,8 @@ #include #include +#include "poly/threading.h" #include "xenia/cpu/runtime.h" -#include "poly/poly.h" #include "xenia/profiling.h" namespace xe { diff --git a/src/xenia/cpu/processor.cc b/src/xenia/cpu/processor.cc index ef54e81d9..e77e63c3b 100644 --- a/src/xenia/cpu/processor.cc +++ b/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" diff --git a/src/xenia/cpu/runtime.cc b/src/xenia/cpu/runtime.cc index 696d18b89..2c981e7e3 100644 --- a/src/xenia/cpu/runtime.cc +++ b/src/xenia/cpu/runtime.cc @@ -11,7 +11,7 @@ #include -#include "poly/poly.h" +#include "poly/assert.h" #include "xdb/protocol.h" #include "xenia/cpu/frontend/ppc_frontend.h" #include "xenia/cpu/module.h" diff --git a/src/xenia/cpu/test/util.h b/src/xenia/cpu/test/util.h index 83f72c6f8..209d8af3c 100644 --- a/src/xenia/cpu/test/util.h +++ b/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" diff --git a/src/xenia/cpu/test/xe-cpu-hir-test.cc b/src/xenia/cpu/test/xe-cpu-hir-test.cc index f812a5b40..af83eb486 100644 --- a/src/xenia/cpu/test/xe-cpu-hir-test.cc +++ b/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 { diff --git a/src/xenia/cpu/test/xe-cpu-sandbox.cc b/src/xenia/cpu/test/xe-cpu-sandbox.cc index 1d9d4b267..c34c862c5 100644 --- a/src/xenia/cpu/test/xe-cpu-sandbox.cc +++ b/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 diff --git a/src/xenia/cpu/test_module.cc b/src/xenia/cpu/test_module.cc index b4730697b..b69264246 100644 --- a/src/xenia/cpu/test_module.cc +++ b/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 { diff --git a/src/xenia/cpu/thread_state.cc b/src/xenia/cpu/thread_state.cc index 09f6f7f57..d4db0c653 100644 --- a/src/xenia/cpu/thread_state.cc +++ b/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" diff --git a/src/xenia/cpu/xex_module.cc b/src/xenia/cpu/xex_module.cc index a4f926dd6..b6e951088 100644 --- a/src/xenia/cpu/xex_module.cc +++ b/src/xenia/cpu/xex_module.cc @@ -11,7 +11,9 @@ #include +#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" diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc index 1fc0b9613..1418cded4 100644 --- a/src/xenia/emulator.cc +++ b/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" diff --git a/src/xenia/gpu/graphics_system.cc b/src/xenia/gpu/graphics_system.cc index ce12aaee8..65e352d7c 100644 --- a/src/xenia/gpu/graphics_system.cc +++ b/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" diff --git a/src/xenia/kernel/kernel_state.cc b/src/xenia/kernel/kernel_state.cc index c2b175284..3548bfccc 100644 --- a/src/xenia/kernel/kernel_state.cc +++ b/src/xenia/kernel/kernel_state.cc @@ -11,6 +11,8 @@ #include +#include "poly/assert.h" +#include "poly/string.h" #include "xenia/emulator.h" #include "xenia/kernel/dispatcher.h" #include "xenia/kernel/xam_module.h" diff --git a/src/xenia/kernel/objects/xthread.cc b/src/xenia/kernel/objects/xthread.cc index 3181a0b7e..fb7bfcf04 100644 --- a/src/xenia/kernel/objects/xthread.cc +++ b/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" diff --git a/src/xenia/kernel/xboxkrnl_rtl.cc b/src/xenia/kernel/xboxkrnl_rtl.cc index cd7dc1779..ffa50b3f6 100644 --- a/src/xenia/kernel/xboxkrnl_rtl.cc +++ b/src/xenia/kernel/xboxkrnl_rtl.cc @@ -9,6 +9,9 @@ #include "xenia/kernel/xboxkrnl_rtl.h" +#include + +#include "poly/atomic.h" #include "poly/string.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/xboxkrnl_private.h" diff --git a/src/xenia/kernel/xboxkrnl_threading.cc b/src/xenia/kernel/xboxkrnl_threading.cc index dcd8be07a..3a1a04167 100644 --- a/src/xenia/kernel/xboxkrnl_threading.cc +++ b/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"