From 82b9841b5a6e967c017efb217d927a1a4b3642e1 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Thu, 21 Aug 2014 20:49:47 -0700 Subject: [PATCH] Removing alloy/core.h. --- src/alloy/alloy-private.h | 2 -- src/alloy/alloy.h | 2 -- src/alloy/arena.h | 2 +- src/alloy/backend/assembler.h | 2 -- src/alloy/backend/backend.h | 1 - src/alloy/backend/ivm/ivm_assembler.cc | 1 + src/alloy/backend/ivm/ivm_assembler.h | 2 -- src/alloy/backend/ivm/ivm_backend.h | 2 -- src/alloy/backend/ivm/ivm_function.h | 23 ++++++++----------- src/alloy/backend/ivm/ivm_intcode.h | 6 ++--- src/alloy/backend/ivm/ivm_stack.h | 2 -- src/alloy/backend/machine_info.h | 2 +- src/alloy/backend/x64/x64_assembler.cc | 1 + src/alloy/backend/x64/x64_assembler.h | 4 +--- src/alloy/backend/x64/x64_backend.h | 2 -- src/alloy/backend/x64/x64_code_cache.h | 2 -- src/alloy/backend/x64/x64_code_cache_win.cc | 1 + src/alloy/backend/x64/x64_emitter.cc | 1 + src/alloy/backend/x64/x64_emitter.h | 3 --- src/alloy/backend/x64/x64_function.h | 1 - src/alloy/backend/x64/x64_sequences.h | 2 -- src/alloy/backend/x64/x64_thunk_emitter.h | 1 - src/alloy/backend/x64/x64_tracers.h | 3 +-- src/alloy/compiler/compiler.cc | 1 + src/alloy/compiler/compiler.h | 1 - src/alloy/compiler/compiler_pass.h | 2 -- .../passes/constant_propagation_pass.cc | 1 + .../compiler/passes/context_promotion_pass.cc | 1 + .../passes/control_flow_analysis_pass.cc | 1 + .../control_flow_simplification_pass.cc | 1 + .../passes/data_flow_analysis_pass.cc | 1 + .../passes/dead_code_elimination_pass.cc | 2 ++ .../compiler/passes/finalization_pass.cc | 1 + .../passes/register_allocation_pass.cc | 2 ++ .../compiler/passes/simplification_pass.cc | 2 ++ src/alloy/compiler/passes/validation_pass.cc | 1 + .../compiler/passes/value_reduction_pass.cc | 1 + src/alloy/core.h | 16 ------------- src/alloy/delegate.h | 2 -- src/alloy/frontend/context_info.h | 2 +- src/alloy/frontend/frontend.h | 3 +-- src/alloy/frontend/ppc/ppc_context.h | 1 - src/alloy/frontend/ppc/ppc_frontend.h | 4 +--- src/alloy/frontend/ppc/ppc_hir_builder.cc | 1 + src/alloy/frontend/ppc/ppc_hir_builder.h | 3 +-- src/alloy/frontend/ppc/ppc_instr.h | 3 +-- src/alloy/frontend/ppc/ppc_scanner.cc | 1 + src/alloy/frontend/ppc/ppc_scanner.h | 1 - src/alloy/frontend/ppc/ppc_translator.cc | 1 + src/alloy/frontend/ppc/ppc_translator.h | 3 +-- src/alloy/hir/block.h | 1 - src/alloy/hir/hir_builder.cc | 3 ++- src/alloy/hir/hir_builder.h | 1 - src/alloy/hir/instr.h | 1 - src/alloy/hir/label.h | 2 -- src/alloy/hir/opcodes.h | 2 +- src/alloy/hir/value.h | 3 +-- src/alloy/memory.h | 3 ++- src/alloy/reset_scope.h | 2 -- src/alloy/runtime/debug_info.cc | 2 ++ src/alloy/runtime/debug_info.h | 2 +- src/alloy/runtime/debugger.h | 1 - src/alloy/runtime/entry_table.cc | 1 + src/alloy/runtime/entry_table.h | 2 -- src/alloy/runtime/function.h | 1 - src/alloy/runtime/instrument.h | 2 +- src/alloy/runtime/module.cc | 1 + src/alloy/runtime/module.h | 2 +- src/alloy/runtime/raw_module.cc | 2 ++ src/alloy/runtime/runtime.cc | 1 + src/alloy/runtime/runtime.h | 3 +-- src/alloy/runtime/symbol_info.h | 3 +-- src/alloy/runtime/thread_state.h | 2 -- src/alloy/sources.gypi | 1 - src/alloy/string_buffer.cc | 1 + src/alloy/string_buffer.h | 3 +-- src/alloy/type_pool.h | 2 -- src/alloy/vec128.h | 1 - xenia.gyp | 1 + 79 files changed, 64 insertions(+), 115 deletions(-) delete mode 100644 src/alloy/core.h diff --git a/src/alloy/alloy-private.h b/src/alloy/alloy-private.h index 8888e7b1c..3efde3d21 100644 --- a/src/alloy/alloy-private.h +++ b/src/alloy/alloy-private.h @@ -10,8 +10,6 @@ #ifndef ALLOY_ALLOY_PRIVATE_H_ #define ALLOY_ALLOY_PRIVATE_H_ -#include - #include DECLARE_bool(debug); diff --git a/src/alloy/alloy.h b/src/alloy/alloy.h index 2a72b6125..2b2d9f318 100644 --- a/src/alloy/alloy.h +++ b/src/alloy/alloy.h @@ -10,8 +10,6 @@ #ifndef ALLOY_ALLOY_H_ #define ALLOY_ALLOY_H_ -#include - #include #include #include diff --git a/src/alloy/arena.h b/src/alloy/arena.h index 3dae80b8d..d7b956001 100644 --- a/src/alloy/arena.h +++ b/src/alloy/arena.h @@ -10,7 +10,7 @@ #ifndef ALLOY_ARENA_H_ #define ALLOY_ARENA_H_ -#include +#include namespace alloy { diff --git a/src/alloy/backend/assembler.h b/src/alloy/backend/assembler.h index 5e721dbd9..e671b6f38 100644 --- a/src/alloy/backend/assembler.h +++ b/src/alloy/backend/assembler.h @@ -12,8 +12,6 @@ #include -#include - namespace alloy { namespace hir { class HIRBuilder; diff --git a/src/alloy/backend/backend.h b/src/alloy/backend/backend.h index e4dea7832..efa8371c1 100644 --- a/src/alloy/backend/backend.h +++ b/src/alloy/backend/backend.h @@ -12,7 +12,6 @@ #include -#include #include namespace alloy { diff --git a/src/alloy/backend/ivm/ivm_assembler.cc b/src/alloy/backend/ivm/ivm_assembler.cc index c01eeb209..a79db653e 100644 --- a/src/alloy/backend/ivm/ivm_assembler.cc +++ b/src/alloy/backend/ivm/ivm_assembler.cc @@ -16,6 +16,7 @@ #include #include #include +#include namespace alloy { namespace backend { diff --git a/src/alloy/backend/ivm/ivm_assembler.h b/src/alloy/backend/ivm/ivm_assembler.h index 4fe079b37..118ef69d5 100644 --- a/src/alloy/backend/ivm/ivm_assembler.h +++ b/src/alloy/backend/ivm/ivm_assembler.h @@ -10,8 +10,6 @@ #ifndef ALLOY_BACKEND_IVM_IVM_ASSEMBLER_H_ #define ALLOY_BACKEND_IVM_IVM_ASSEMBLER_H_ -#include - #include #include diff --git a/src/alloy/backend/ivm/ivm_backend.h b/src/alloy/backend/ivm/ivm_backend.h index b01536b6b..46814353b 100644 --- a/src/alloy/backend/ivm/ivm_backend.h +++ b/src/alloy/backend/ivm/ivm_backend.h @@ -10,8 +10,6 @@ #ifndef ALLOY_BACKEND_IVM_IVM_BACKEND_H_ #define ALLOY_BACKEND_IVM_IVM_BACKEND_H_ -#include - #include namespace alloy { diff --git a/src/alloy/backend/ivm/ivm_function.h b/src/alloy/backend/ivm/ivm_function.h index 0169ee5b1..31eb07084 100644 --- a/src/alloy/backend/ivm/ivm_function.h +++ b/src/alloy/backend/ivm/ivm_function.h @@ -10,47 +10,42 @@ #ifndef ALLOY_BACKEND_IVM_IVM_FUNCTION_H_ #define ALLOY_BACKEND_IVM_IVM_FUNCTION_H_ -#include #include #include #include - namespace alloy { namespace backend { namespace ivm { - class IVMFunction : public runtime::Function { -public: + public: IVMFunction(runtime::FunctionInfo* symbol_info); virtual ~IVMFunction(); void Setup(TranslationContext& ctx); -protected: + protected: virtual int AddBreakpointImpl(runtime::Breakpoint* breakpoint); virtual int RemoveBreakpointImpl(runtime::Breakpoint* breakpoint); virtual int CallImpl(runtime::ThreadState* thread_state, uint64_t return_address); -private: + private: IntCode* GetIntCodeAtSourceOffset(uint64_t offset); void OnBreakpointHit(runtime::ThreadState* thread_state, IntCode* i); -private: - size_t register_count_; - size_t stack_size_; - size_t intcode_count_; - IntCode* intcodes_; - size_t source_map_count_; + private: + size_t register_count_; + size_t stack_size_; + size_t intcode_count_; + IntCode* intcodes_; + size_t source_map_count_; SourceMapEntry* source_map_; }; - } // namespace ivm } // namespace backend } // namespace alloy - #endif // ALLOY_BACKEND_IVM_IVM_FUNCTION_H_ diff --git a/src/alloy/backend/ivm/ivm_intcode.h b/src/alloy/backend/ivm/ivm_intcode.h index bd982eef1..025f533bc 100644 --- a/src/alloy/backend/ivm/ivm_intcode.h +++ b/src/alloy/backend/ivm/ivm_intcode.h @@ -10,16 +10,14 @@ #ifndef ALLOY_BACKEND_IVM_INTCODE_H_ #define ALLOY_BACKEND_IVM_INTCODE_H_ -#include - #include #include namespace alloy { namespace runtime { class ThreadState; -} -} +} // namespace runtime +} // namespace alloy namespace alloy { namespace backend { diff --git a/src/alloy/backend/ivm/ivm_stack.h b/src/alloy/backend/ivm/ivm_stack.h index 1d447ffc7..f02a169f4 100644 --- a/src/alloy/backend/ivm/ivm_stack.h +++ b/src/alloy/backend/ivm/ivm_stack.h @@ -10,8 +10,6 @@ #ifndef ALLOY_BACKEND_IVM_IVM_STACK_H_ #define ALLOY_BACKEND_IVM_IVM_STACK_H_ -#include - #include namespace alloy { diff --git a/src/alloy/backend/machine_info.h b/src/alloy/backend/machine_info.h index d041489e4..709156624 100644 --- a/src/alloy/backend/machine_info.h +++ b/src/alloy/backend/machine_info.h @@ -10,7 +10,7 @@ #ifndef ALLOY_BACKEND_MACHINE_INFO_H_ #define ALLOY_BACKEND_MACHINE_INFO_H_ -#include +#include namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_assembler.cc b/src/alloy/backend/x64/x64_assembler.cc index 2b4075df2..17e36025a 100644 --- a/src/alloy/backend/x64/x64_assembler.cc +++ b/src/alloy/backend/x64/x64_assembler.cc @@ -16,6 +16,7 @@ #include #include #include +#include namespace BE { #include diff --git a/src/alloy/backend/x64/x64_assembler.h b/src/alloy/backend/x64/x64_assembler.h index a1b81e198..03714e680 100644 --- a/src/alloy/backend/x64/x64_assembler.h +++ b/src/alloy/backend/x64/x64_assembler.h @@ -12,10 +12,8 @@ #include -#include - -#include #include +#include namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_backend.h b/src/alloy/backend/x64/x64_backend.h index e8322ee1a..d285417f1 100644 --- a/src/alloy/backend/x64/x64_backend.h +++ b/src/alloy/backend/x64/x64_backend.h @@ -10,8 +10,6 @@ #ifndef ALLOY_BACKEND_X64_X64_BACKEND_H_ #define ALLOY_BACKEND_X64_X64_BACKEND_H_ -#include - #include namespace alloy { diff --git a/src/alloy/backend/x64/x64_code_cache.h b/src/alloy/backend/x64/x64_code_cache.h index 8a0953f15..014fb8510 100644 --- a/src/alloy/backend/x64/x64_code_cache.h +++ b/src/alloy/backend/x64/x64_code_cache.h @@ -12,8 +12,6 @@ #include -#include - namespace alloy { namespace backend { namespace x64 { diff --git a/src/alloy/backend/x64/x64_code_cache_win.cc b/src/alloy/backend/x64/x64_code_cache_win.cc index 75ed4ee37..0b4a04c63 100644 --- a/src/alloy/backend/x64/x64_code_cache_win.cc +++ b/src/alloy/backend/x64/x64_code_cache_win.cc @@ -10,6 +10,7 @@ #include #include +#include namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_emitter.cc b/src/alloy/backend/x64/x64_emitter.cc index f90d1b0bf..fc06a63ac 100644 --- a/src/alloy/backend/x64/x64_emitter.cc +++ b/src/alloy/backend/x64/x64_emitter.cc @@ -20,6 +20,7 @@ #include #include #include +#include namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_emitter.h b/src/alloy/backend/x64/x64_emitter.h index d51f255ca..e63b72b7f 100644 --- a/src/alloy/backend/x64/x64_emitter.h +++ b/src/alloy/backend/x64/x64_emitter.h @@ -10,10 +10,7 @@ #ifndef ALLOY_BACKEND_X64_X64_EMITTER_H_ #define ALLOY_BACKEND_X64_X64_EMITTER_H_ -#include - #include - #include namespace alloy { diff --git a/src/alloy/backend/x64/x64_function.h b/src/alloy/backend/x64/x64_function.h index 6e5812362..24d4af098 100644 --- a/src/alloy/backend/x64/x64_function.h +++ b/src/alloy/backend/x64/x64_function.h @@ -10,7 +10,6 @@ #ifndef ALLOY_BACKEND_X64_X64_FUNCTION_H_ #define ALLOY_BACKEND_X64_X64_FUNCTION_H_ -#include #include #include diff --git a/src/alloy/backend/x64/x64_sequences.h b/src/alloy/backend/x64/x64_sequences.h index 3bfe6d94b..2e77112fa 100644 --- a/src/alloy/backend/x64/x64_sequences.h +++ b/src/alloy/backend/x64/x64_sequences.h @@ -10,8 +10,6 @@ #ifndef ALLOY_BACKEND_X64_X64_SEQUENCES_H_ #define ALLOY_BACKEND_X64_X64_SEQUENCES_H_ -#include - namespace alloy { namespace hir { class Instr; diff --git a/src/alloy/backend/x64/x64_thunk_emitter.h b/src/alloy/backend/x64/x64_thunk_emitter.h index 6e6b8d428..a07b6f0c8 100644 --- a/src/alloy/backend/x64/x64_thunk_emitter.h +++ b/src/alloy/backend/x64/x64_thunk_emitter.h @@ -10,7 +10,6 @@ #ifndef ALLOY_BACKEND_X64_X64_THUNK_EMITTER_H_ #define ALLOY_BACKEND_X64_X64_THUNK_EMITTER_H_ -#include #include #include diff --git a/src/alloy/backend/x64/x64_tracers.h b/src/alloy/backend/x64/x64_tracers.h index 9b50ce610..8015f8a69 100644 --- a/src/alloy/backend/x64/x64_tracers.h +++ b/src/alloy/backend/x64/x64_tracers.h @@ -10,9 +10,8 @@ #ifndef ALLOY_BACKEND_X64_X64_TRACERS_H_ #define ALLOY_BACKEND_X64_X64_TRACERS_H_ -#include - #include +#include namespace alloy { namespace backend { diff --git a/src/alloy/compiler/compiler.cc b/src/alloy/compiler/compiler.cc index b74ada3cf..50b295803 100644 --- a/src/alloy/compiler/compiler.cc +++ b/src/alloy/compiler/compiler.cc @@ -10,6 +10,7 @@ #include #include +#include namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/compiler.h b/src/alloy/compiler/compiler.h index ed592bdb8..1f1c911f9 100644 --- a/src/alloy/compiler/compiler.h +++ b/src/alloy/compiler/compiler.h @@ -13,7 +13,6 @@ #include #include -#include #include namespace alloy { diff --git a/src/alloy/compiler/compiler_pass.h b/src/alloy/compiler/compiler_pass.h index 281d578f5..f00aa42ab 100644 --- a/src/alloy/compiler/compiler_pass.h +++ b/src/alloy/compiler/compiler_pass.h @@ -10,8 +10,6 @@ #ifndef ALLOY_COMPILER_COMPILER_PASS_H_ #define ALLOY_COMPILER_COMPILER_PASS_H_ -#include - #include namespace alloy { diff --git a/src/alloy/compiler/passes/constant_propagation_pass.cc b/src/alloy/compiler/passes/constant_propagation_pass.cc index 64eeb5f1d..471bc2633 100644 --- a/src/alloy/compiler/passes/constant_propagation_pass.cc +++ b/src/alloy/compiler/passes/constant_propagation_pass.cc @@ -11,6 +11,7 @@ #include #include +#include namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/context_promotion_pass.cc b/src/alloy/compiler/passes/context_promotion_pass.cc index f00d605b5..1b47246c0 100644 --- a/src/alloy/compiler/passes/context_promotion_pass.cc +++ b/src/alloy/compiler/passes/context_promotion_pass.cc @@ -13,6 +13,7 @@ #include #include +#include DEFINE_bool(store_all_context_values, false, "Don't strip dead context stores to aid in debugging."); diff --git a/src/alloy/compiler/passes/control_flow_analysis_pass.cc b/src/alloy/compiler/passes/control_flow_analysis_pass.cc index 85b2bcfe4..ce379cee6 100644 --- a/src/alloy/compiler/passes/control_flow_analysis_pass.cc +++ b/src/alloy/compiler/passes/control_flow_analysis_pass.cc @@ -12,6 +12,7 @@ #include #include #include +#include namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/control_flow_simplification_pass.cc b/src/alloy/compiler/passes/control_flow_simplification_pass.cc index 1891f2d7b..1e404dbe1 100644 --- a/src/alloy/compiler/passes/control_flow_simplification_pass.cc +++ b/src/alloy/compiler/passes/control_flow_simplification_pass.cc @@ -12,6 +12,7 @@ #include #include #include +#include namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/data_flow_analysis_pass.cc b/src/alloy/compiler/passes/data_flow_analysis_pass.cc index 28b0a6d5a..7f0737028 100644 --- a/src/alloy/compiler/passes/data_flow_analysis_pass.cc +++ b/src/alloy/compiler/passes/data_flow_analysis_pass.cc @@ -12,6 +12,7 @@ #include #include #include +#include #if XE_COMPILER_MSVC #pragma warning(push) diff --git a/src/alloy/compiler/passes/dead_code_elimination_pass.cc b/src/alloy/compiler/passes/dead_code_elimination_pass.cc index 40f83bb3d..6ff73609e 100644 --- a/src/alloy/compiler/passes/dead_code_elimination_pass.cc +++ b/src/alloy/compiler/passes/dead_code_elimination_pass.cc @@ -9,6 +9,8 @@ #include +#include + namespace alloy { namespace compiler { namespace passes { diff --git a/src/alloy/compiler/passes/finalization_pass.cc b/src/alloy/compiler/passes/finalization_pass.cc index fcd827d1f..12e4254d7 100644 --- a/src/alloy/compiler/passes/finalization_pass.cc +++ b/src/alloy/compiler/passes/finalization_pass.cc @@ -12,6 +12,7 @@ #include #include #include +#include namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/register_allocation_pass.cc b/src/alloy/compiler/passes/register_allocation_pass.cc index 4db4cd1ef..f388f90c1 100644 --- a/src/alloy/compiler/passes/register_allocation_pass.cc +++ b/src/alloy/compiler/passes/register_allocation_pass.cc @@ -11,6 +11,8 @@ #include +#include + namespace alloy { namespace compiler { namespace passes { diff --git a/src/alloy/compiler/passes/simplification_pass.cc b/src/alloy/compiler/passes/simplification_pass.cc index 22ec69820..c1d73db6b 100644 --- a/src/alloy/compiler/passes/simplification_pass.cc +++ b/src/alloy/compiler/passes/simplification_pass.cc @@ -9,6 +9,8 @@ #include +#include + namespace alloy { namespace compiler { namespace passes { diff --git a/src/alloy/compiler/passes/validation_pass.cc b/src/alloy/compiler/passes/validation_pass.cc index bc6c8d536..9b6d209fb 100644 --- a/src/alloy/compiler/passes/validation_pass.cc +++ b/src/alloy/compiler/passes/validation_pass.cc @@ -12,6 +12,7 @@ #include #include #include +#include namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/value_reduction_pass.cc b/src/alloy/compiler/passes/value_reduction_pass.cc index 1d51de912..d46037fe0 100644 --- a/src/alloy/compiler/passes/value_reduction_pass.cc +++ b/src/alloy/compiler/passes/value_reduction_pass.cc @@ -12,6 +12,7 @@ #include #include #include +#include #if XE_COMPILER_MSVC #pragma warning(push) diff --git a/src/alloy/core.h b/src/alloy/core.h deleted file mode 100644 index eedae6ac1..000000000 --- a/src/alloy/core.h +++ /dev/null @@ -1,16 +0,0 @@ -/** - ****************************************************************************** - * Xenia : Xbox 360 Emulator Research Project * - ****************************************************************************** - * Copyright 2013 Ben Vanik. All rights reserved. * - * Released under the BSD license - see LICENSE in the root for more details. * - ****************************************************************************** - */ - -#ifndef ALLOY_CORE_H_ -#define ALLOY_CORE_H_ - -// TODO(benvanik): move the common stuff into here? -#include - -#endif // ALLOY_CORE_H_ diff --git a/src/alloy/delegate.h b/src/alloy/delegate.h index 1c6ca5f42..137773ab6 100644 --- a/src/alloy/delegate.h +++ b/src/alloy/delegate.h @@ -14,8 +14,6 @@ #include #include -#include - namespace alloy { // TODO(benvanik): go lockfree, and don't hold the lock while emitting. diff --git a/src/alloy/frontend/context_info.h b/src/alloy/frontend/context_info.h index f9bf530d4..506b3572c 100644 --- a/src/alloy/frontend/context_info.h +++ b/src/alloy/frontend/context_info.h @@ -10,7 +10,7 @@ #ifndef ALLOY_FRONTEND_CONTEXT_INFO_H_ #define ALLOY_FRONTEND_CONTEXT_INFO_H_ -#include +#include namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/frontend.h b/src/alloy/frontend/frontend.h index 7555324b3..83d0f9839 100644 --- a/src/alloy/frontend/frontend.h +++ b/src/alloy/frontend/frontend.h @@ -12,9 +12,8 @@ #include -#include -#include #include +#include #include #include diff --git a/src/alloy/frontend/ppc/ppc_context.h b/src/alloy/frontend/ppc/ppc_context.h index c0409e067..44d0ec080 100644 --- a/src/alloy/frontend/ppc/ppc_context.h +++ b/src/alloy/frontend/ppc/ppc_context.h @@ -10,7 +10,6 @@ #ifndef ALLOY_FRONTEND_PPC_PPC_CONTEXT_H_ #define ALLOY_FRONTEND_PPC_PPC_CONTEXT_H_ -#include #include #include diff --git a/src/alloy/frontend/ppc/ppc_frontend.h b/src/alloy/frontend/ppc/ppc_frontend.h index 50608f934..9b524fc00 100644 --- a/src/alloy/frontend/ppc/ppc_frontend.h +++ b/src/alloy/frontend/ppc/ppc_frontend.h @@ -10,10 +10,8 @@ #ifndef ALLOY_FRONTEND_PPC_PPC_FRONTEND_H_ #define ALLOY_FRONTEND_PPC_PPC_FRONTEND_H_ -#include -#include - #include +#include namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_hir_builder.cc b/src/alloy/frontend/ppc/ppc_hir_builder.cc index d0b6581e6..12431412e 100644 --- a/src/alloy/frontend/ppc/ppc_hir_builder.cc +++ b/src/alloy/frontend/ppc/ppc_hir_builder.cc @@ -16,6 +16,7 @@ #include #include #include +#include namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_hir_builder.h b/src/alloy/frontend/ppc/ppc_hir_builder.h index afbece4e3..ffe1a1a7b 100644 --- a/src/alloy/frontend/ppc/ppc_hir_builder.h +++ b/src/alloy/frontend/ppc/ppc_hir_builder.h @@ -10,11 +10,10 @@ #ifndef ALLOY_FRONTEND_PPC_PPC_HIR_BUILDER_H_ #define ALLOY_FRONTEND_PPC_PPC_HIR_BUILDER_H_ -#include -#include #include #include #include +#include namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_instr.h b/src/alloy/frontend/ppc/ppc_instr.h index c080f82b1..f6052078b 100644 --- a/src/alloy/frontend/ppc/ppc_instr.h +++ b/src/alloy/frontend/ppc/ppc_instr.h @@ -10,11 +10,10 @@ #ifndef ALLOY_FRONTEND_PPC_PPC_INSTR_H_ #define ALLOY_FRONTEND_PPC_PPC_INSTR_H_ +#include #include #include -#include - namespace alloy { class StringBuffer; } // namespace alloy diff --git a/src/alloy/frontend/ppc/ppc_scanner.cc b/src/alloy/frontend/ppc/ppc_scanner.cc index ba255ab07..2ff120ea7 100644 --- a/src/alloy/frontend/ppc/ppc_scanner.cc +++ b/src/alloy/frontend/ppc/ppc_scanner.cc @@ -17,6 +17,7 @@ #include #include #include +#include #if 0 #define LOGPPC(fmt, ...) PLOGCORE('p', fmt, ##__VA_ARGS__) diff --git a/src/alloy/frontend/ppc/ppc_scanner.h b/src/alloy/frontend/ppc/ppc_scanner.h index 769b879d6..1eddcfd35 100644 --- a/src/alloy/frontend/ppc/ppc_scanner.h +++ b/src/alloy/frontend/ppc/ppc_scanner.h @@ -12,7 +12,6 @@ #include -#include #include namespace alloy { diff --git a/src/alloy/frontend/ppc/ppc_translator.cc b/src/alloy/frontend/ppc/ppc_translator.cc index a6059459d..b89497885 100644 --- a/src/alloy/frontend/ppc/ppc_translator.cc +++ b/src/alloy/frontend/ppc/ppc_translator.cc @@ -18,6 +18,7 @@ #include #include #include +#include namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_translator.h b/src/alloy/frontend/ppc/ppc_translator.h index 4c95e94b4..a24ddbb46 100644 --- a/src/alloy/frontend/ppc/ppc_translator.h +++ b/src/alloy/frontend/ppc/ppc_translator.h @@ -12,11 +12,10 @@ #include -#include -#include #include #include #include +#include namespace alloy { namespace frontend { diff --git a/src/alloy/hir/block.h b/src/alloy/hir/block.h index b62f70b58..70f11cac2 100644 --- a/src/alloy/hir/block.h +++ b/src/alloy/hir/block.h @@ -11,7 +11,6 @@ #define ALLOY_HIR_BLOCK_H_ #include -#include namespace llvm { class BitVector; diff --git a/src/alloy/hir/hir_builder.cc b/src/alloy/hir/hir_builder.cc index 72871413f..ccc089eb8 100644 --- a/src/alloy/hir/hir_builder.cc +++ b/src/alloy/hir/hir_builder.cc @@ -9,11 +9,12 @@ #include -#include #include #include #include #include +#include +#include namespace alloy { namespace hir { diff --git a/src/alloy/hir/hir_builder.h b/src/alloy/hir/hir_builder.h index ae0b23e55..ccbd3b339 100644 --- a/src/alloy/hir/hir_builder.h +++ b/src/alloy/hir/hir_builder.h @@ -12,7 +12,6 @@ #include -#include #include #include #include diff --git a/src/alloy/hir/instr.h b/src/alloy/hir/instr.h index c72c7d9e2..259ef843b 100644 --- a/src/alloy/hir/instr.h +++ b/src/alloy/hir/instr.h @@ -10,7 +10,6 @@ #ifndef ALLOY_HIR_INSTR_H_ #define ALLOY_HIR_INSTR_H_ -#include #include #include diff --git a/src/alloy/hir/label.h b/src/alloy/hir/label.h index 74beaa92d..bea95e7fc 100644 --- a/src/alloy/hir/label.h +++ b/src/alloy/hir/label.h @@ -10,8 +10,6 @@ #ifndef ALLOY_HIR_LABEL_H_ #define ALLOY_HIR_LABEL_H_ -#include - namespace alloy { namespace hir { diff --git a/src/alloy/hir/opcodes.h b/src/alloy/hir/opcodes.h index cfca101a0..cf84944cc 100644 --- a/src/alloy/hir/opcodes.h +++ b/src/alloy/hir/opcodes.h @@ -10,7 +10,7 @@ #ifndef ALLOY_HIR_OPCODES_H_ #define ALLOY_HIR_OPCODES_H_ -#include +#include namespace alloy { namespace hir { diff --git a/src/alloy/hir/value.h b/src/alloy/hir/value.h index 1a3097480..0b1fc38ad 100644 --- a/src/alloy/hir/value.h +++ b/src/alloy/hir/value.h @@ -10,11 +10,10 @@ #ifndef ALLOY_HIR_VALUE_H_ #define ALLOY_HIR_VALUE_H_ -#include #include -#include #include #include +#include #include namespace alloy { diff --git a/src/alloy/memory.h b/src/alloy/memory.h index 869fc4eb7..e0e42d116 100644 --- a/src/alloy/memory.h +++ b/src/alloy/memory.h @@ -10,7 +10,8 @@ #ifndef ALLOY_MEMORY_H_ #define ALLOY_MEMORY_H_ -#include +#include +#include namespace alloy { diff --git a/src/alloy/reset_scope.h b/src/alloy/reset_scope.h index d10c2561d..1007b1e25 100644 --- a/src/alloy/reset_scope.h +++ b/src/alloy/reset_scope.h @@ -12,8 +12,6 @@ #include -#include - namespace alloy { template diff --git a/src/alloy/runtime/debug_info.cc b/src/alloy/runtime/debug_info.cc index 0eac0b795..5abe39257 100644 --- a/src/alloy/runtime/debug_info.cc +++ b/src/alloy/runtime/debug_info.cc @@ -9,6 +9,8 @@ #include +#include + namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/debug_info.h b/src/alloy/runtime/debug_info.h index fa4ee4f3a..6df923a69 100644 --- a/src/alloy/runtime/debug_info.h +++ b/src/alloy/runtime/debug_info.h @@ -10,7 +10,7 @@ #ifndef ALLOY_RUNTIME_DEBUG_INFO_H_ #define ALLOY_RUNTIME_DEBUG_INFO_H_ -#include +#include namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/debugger.h b/src/alloy/runtime/debugger.h index 789e894a8..1ab802f40 100644 --- a/src/alloy/runtime/debugger.h +++ b/src/alloy/runtime/debugger.h @@ -15,7 +15,6 @@ #include #include -#include #include namespace alloy { diff --git a/src/alloy/runtime/entry_table.cc b/src/alloy/runtime/entry_table.cc index 17c737bb9..b309bbc15 100644 --- a/src/alloy/runtime/entry_table.cc +++ b/src/alloy/runtime/entry_table.cc @@ -10,6 +10,7 @@ #include #include +#include namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/entry_table.h b/src/alloy/runtime/entry_table.h index 1fe466a8a..fb70c4847 100644 --- a/src/alloy/runtime/entry_table.h +++ b/src/alloy/runtime/entry_table.h @@ -14,8 +14,6 @@ #include #include -#include - namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/function.h b/src/alloy/runtime/function.h index 68366ba8f..c244813a9 100644 --- a/src/alloy/runtime/function.h +++ b/src/alloy/runtime/function.h @@ -14,7 +14,6 @@ #include #include -#include #include namespace alloy { diff --git a/src/alloy/runtime/instrument.h b/src/alloy/runtime/instrument.h index 631c72c55..6ef8ce3a6 100644 --- a/src/alloy/runtime/instrument.h +++ b/src/alloy/runtime/instrument.h @@ -10,7 +10,7 @@ #ifndef ALLOY_RUNTIME_INSTRUMENT_H_ #define ALLOY_RUNTIME_INSTRUMENT_H_ -#include +#include namespace alloy { class Memory; diff --git a/src/alloy/runtime/module.cc b/src/alloy/runtime/module.cc index 8184e2d53..7278b9c1b 100644 --- a/src/alloy/runtime/module.cc +++ b/src/alloy/runtime/module.cc @@ -14,6 +14,7 @@ #include #include +#include namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/module.h b/src/alloy/runtime/module.h index 0c46c0418..88a1c4b94 100644 --- a/src/alloy/runtime/module.h +++ b/src/alloy/runtime/module.h @@ -11,11 +11,11 @@ #define ALLOY_RUNTIME_MODULE_H_ #include +#include #include #include #include -#include #include #include diff --git a/src/alloy/runtime/raw_module.cc b/src/alloy/runtime/raw_module.cc index 765d6a371..86eda6c2e 100644 --- a/src/alloy/runtime/raw_module.cc +++ b/src/alloy/runtime/raw_module.cc @@ -9,6 +9,8 @@ #include +#include + namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/runtime.cc b/src/alloy/runtime/runtime.cc index 9189cc299..8cf99d4a1 100644 --- a/src/alloy/runtime/runtime.cc +++ b/src/alloy/runtime/runtime.cc @@ -14,6 +14,7 @@ #include #include #include +#include // TODO(benvanik): based on compiler support #include diff --git a/src/alloy/runtime/runtime.h b/src/alloy/runtime/runtime.h index a9fe9c374..279edaf7c 100644 --- a/src/alloy/runtime/runtime.h +++ b/src/alloy/runtime/runtime.h @@ -14,10 +14,9 @@ #include #include -#include -#include #include #include +#include #include #include #include diff --git a/src/alloy/runtime/symbol_info.h b/src/alloy/runtime/symbol_info.h index 50f97e322..0f71323c1 100644 --- a/src/alloy/runtime/symbol_info.h +++ b/src/alloy/runtime/symbol_info.h @@ -10,10 +10,9 @@ #ifndef ALLOY_RUNTIME_SYMBOL_INFO_H_ #define ALLOY_RUNTIME_SYMBOL_INFO_H_ +#include #include -#include - namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/thread_state.h b/src/alloy/runtime/thread_state.h index 9cb2f7e96..012f0bf6f 100644 --- a/src/alloy/runtime/thread_state.h +++ b/src/alloy/runtime/thread_state.h @@ -12,8 +12,6 @@ #include -#include - #include namespace alloy { diff --git a/src/alloy/sources.gypi b/src/alloy/sources.gypi index 0854a8bc1..44a87a7d2 100644 --- a/src/alloy/sources.gypi +++ b/src/alloy/sources.gypi @@ -6,7 +6,6 @@ 'alloy.h', 'arena.cc', 'arena.h', - 'core.h', 'delegate.h', 'memory.cc', 'memory.h', diff --git a/src/alloy/string_buffer.cc b/src/alloy/string_buffer.cc index b53601aa3..bb9270def 100644 --- a/src/alloy/string_buffer.cc +++ b/src/alloy/string_buffer.cc @@ -10,6 +10,7 @@ #include #include +#include namespace alloy { diff --git a/src/alloy/string_buffer.h b/src/alloy/string_buffer.h index d6c2fcd0d..e2b294d64 100644 --- a/src/alloy/string_buffer.h +++ b/src/alloy/string_buffer.h @@ -10,11 +10,10 @@ #ifndef ALLOY_STRING_BUFFER_H_ #define ALLOY_STRING_BUFFER_H_ +#include #include #include -#include - namespace alloy { class StringBuffer { diff --git a/src/alloy/type_pool.h b/src/alloy/type_pool.h index 6483c9514..3ba2bd754 100644 --- a/src/alloy/type_pool.h +++ b/src/alloy/type_pool.h @@ -13,8 +13,6 @@ #include #include -#include - namespace alloy { template diff --git a/src/alloy/vec128.h b/src/alloy/vec128.h index 35caef5d1..c5b7bc81f 100644 --- a/src/alloy/vec128.h +++ b/src/alloy/vec128.h @@ -10,7 +10,6 @@ #ifndef ALLOY_VEC128_H_ #define ALLOY_VEC128_H_ -#include #include namespace alloy { diff --git a/xenia.gyp b/xenia.gyp index ebbd30f68..0fddef162 100644 --- a/xenia.gyp +++ b/xenia.gyp @@ -45,6 +45,7 @@ '__STDC_LIMIT_MACROS=1', '__STDC_CONSTANT_MACROS=1', '_ISOC99_SOURCE=1', + '_CRT_NONSTDC_NO_DEPRECATE=1', ], 'conditions': [