From 00e4a4fe1b63e3cf9e46b84b2560629976080429 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Sat, 31 Jan 2015 22:49:47 -0800 Subject: [PATCH] Fix #include format. --- src/alloy/alloy.cc | 4 +-- src/alloy/alloy.h | 8 +++--- src/alloy/arena.cc | 4 +-- src/alloy/backend/assembler.cc | 2 +- src/alloy/backend/backend.cc | 2 +- src/alloy/backend/backend.h | 2 +- src/alloy/backend/x64/x64_assembler.cc | 18 ++++++------- src/alloy/backend/x64/x64_assembler.h | 4 +-- src/alloy/backend/x64/x64_backend.cc | 10 +++---- src/alloy/backend/x64/x64_backend.h | 2 +- src/alloy/backend/x64/x64_code_cache_win.cc | 6 ++--- src/alloy/backend/x64/x64_emitter.cc | 26 +++++++++---------- src/alloy/backend/x64/x64_emitter.h | 4 +-- src/alloy/backend/x64/x64_function.cc | 8 +++--- src/alloy/backend/x64/x64_function.h | 4 +-- src/alloy/backend/x64/x64_sequences.cc | 12 ++++----- src/alloy/backend/x64/x64_thunk_emitter.cc | 4 +-- src/alloy/backend/x64/x64_thunk_emitter.h | 4 +-- src/alloy/backend/x64/x64_tracers.cc | 8 +++--- src/alloy/compiler/compiler.cc | 6 ++--- src/alloy/compiler/compiler.h | 2 +- src/alloy/compiler/compiler_pass.cc | 4 +-- src/alloy/compiler/compiler_pass.h | 2 +- src/alloy/compiler/compiler_passes.h | 24 ++++++++--------- .../passes/constant_propagation_pass.cc | 8 +++--- .../passes/constant_propagation_pass.h | 2 +- .../compiler/passes/context_promotion_pass.cc | 8 +++--- .../compiler/passes/context_promotion_pass.h | 2 +- .../passes/control_flow_analysis_pass.cc | 10 +++---- .../passes/control_flow_analysis_pass.h | 2 +- .../control_flow_simplification_pass.cc | 10 +++---- .../passes/control_flow_simplification_pass.h | 2 +- .../passes/data_flow_analysis_pass.cc | 10 +++---- .../compiler/passes/data_flow_analysis_pass.h | 2 +- .../passes/dead_code_elimination_pass.cc | 4 +-- .../passes/dead_code_elimination_pass.h | 2 +- .../compiler/passes/finalization_pass.cc | 10 +++---- src/alloy/compiler/passes/finalization_pass.h | 2 +- .../passes/register_allocation_pass.cc | 4 +-- .../passes/register_allocation_pass.h | 4 +-- .../compiler/passes/simplification_pass.cc | 4 +-- .../compiler/passes/simplification_pass.h | 2 +- src/alloy/compiler/passes/validation_pass.cc | 10 +++---- src/alloy/compiler/passes/validation_pass.h | 2 +- .../compiler/passes/value_reduction_pass.cc | 10 +++---- .../compiler/passes/value_reduction_pass.h | 2 +- src/alloy/frontend/context_info.cc | 2 +- src/alloy/frontend/frontend.cc | 4 +-- src/alloy/frontend/frontend.h | 8 +++--- src/alloy/frontend/ppc/ppc_context.cc | 2 +- src/alloy/frontend/ppc/ppc_context.h | 4 +-- src/alloy/frontend/ppc/ppc_disasm.cc | 6 ++--- src/alloy/frontend/ppc/ppc_disasm.h | 2 +- src/alloy/frontend/ppc/ppc_emit-private.h | 4 +-- src/alloy/frontend/ppc/ppc_emit.h | 2 +- src/alloy/frontend/ppc/ppc_emit_altivec.cc | 6 ++--- src/alloy/frontend/ppc/ppc_emit_alu.cc | 6 ++--- src/alloy/frontend/ppc/ppc_emit_control.cc | 6 ++--- src/alloy/frontend/ppc/ppc_emit_fpu.cc | 6 ++--- src/alloy/frontend/ppc/ppc_emit_memory.cc | 6 ++--- src/alloy/frontend/ppc/ppc_frontend.cc | 12 ++++----- src/alloy/frontend/ppc/ppc_frontend.h | 4 +-- src/alloy/frontend/ppc/ppc_hir_builder.cc | 18 ++++++------- src/alloy/frontend/ppc/ppc_hir_builder.h | 8 +++--- src/alloy/frontend/ppc/ppc_instr.cc | 8 +++--- src/alloy/frontend/ppc/ppc_instr_tables.h | 4 +-- src/alloy/frontend/ppc/ppc_scanner.cc | 14 +++++----- src/alloy/frontend/ppc/ppc_scanner.h | 2 +- src/alloy/frontend/ppc/ppc_translator.cc | 22 ++++++++-------- src/alloy/frontend/ppc/ppc_translator.h | 8 +++--- src/alloy/frontend/ppc/test/alloy-ppc-test.cc | 14 +++++----- src/alloy/hir/block.cc | 4 +-- src/alloy/hir/block.h | 2 +- src/alloy/hir/hir_builder.cc | 14 +++++----- src/alloy/hir/hir_builder.h | 10 +++---- src/alloy/hir/instr.cc | 4 +-- src/alloy/hir/instr.h | 4 +-- src/alloy/hir/opcodes.cc | 4 +-- src/alloy/hir/opcodes.h | 2 +- src/alloy/hir/value.cc | 2 +- src/alloy/hir/value.h | 10 +++---- src/alloy/memory.cc | 4 +-- src/alloy/runtime/debug_info.cc | 2 +- src/alloy/runtime/debugger.cc | 4 +-- src/alloy/runtime/debugger.h | 2 +- src/alloy/runtime/entry_table.cc | 6 ++--- src/alloy/runtime/function.cc | 10 +++---- src/alloy/runtime/function.h | 2 +- src/alloy/runtime/instrument.cc | 8 +++--- src/alloy/runtime/module.cc | 8 +++--- src/alloy/runtime/module.h | 4 +-- src/alloy/runtime/raw_module.cc | 6 ++--- src/alloy/runtime/raw_module.h | 2 +- src/alloy/runtime/runtime.cc | 12 ++++----- src/alloy/runtime/runtime.h | 16 ++++++------ src/alloy/runtime/symbol_info.cc | 2 +- src/alloy/runtime/test_module.cc | 12 ++++----- src/alloy/runtime/test_module.h | 8 +++--- src/alloy/runtime/thread_state.cc | 6 ++--- src/alloy/runtime/thread_state.h | 2 +- src/alloy/string_buffer.cc | 2 +- src/alloy/test/alloy-test.cc | 4 +-- src/alloy/test/test_add.cc | 2 +- src/alloy/test/test_byte_swap.cc | 2 +- src/alloy/test/test_extract.cc | 2 +- src/alloy/test/test_insert.cc | 2 +- src/alloy/test/test_load_vector_shl_shr.cc | 2 +- src/alloy/test/test_pack.cc | 2 +- src/alloy/test/test_permute.cc | 2 +- src/alloy/test/test_sha.cc | 2 +- src/alloy/test/test_shl.cc | 2 +- src/alloy/test/test_shr.cc | 2 +- src/alloy/test/test_swizzle.cc | 2 +- src/alloy/test/test_unpack.cc | 2 +- src/alloy/test/test_vector_add.cc | 2 +- src/alloy/test/test_vector_max.cc | 2 +- src/alloy/test/test_vector_min.cc | 2 +- src/alloy/test/test_vector_rotate_left.cc | 4 +-- src/alloy/test/test_vector_sha.cc | 2 +- src/alloy/test/test_vector_shl.cc | 2 +- src/alloy/test/test_vector_shr.cc | 2 +- src/alloy/test/util.h | 18 ++++++------- src/alloy/vec128.h | 2 +- src/poly/assert.h | 4 +-- src/poly/atomic.h | 4 +-- src/poly/byte_order.h | 4 +-- src/poly/cxx_compat.h | 2 +- src/poly/debugging.h | 2 +- src/poly/debugging_win.cc | 2 +- src/poly/logging.cc | 8 +++--- src/poly/logging.h | 2 +- src/poly/main.h | 2 +- src/poly/main_win.cc | 4 +-- src/poly/mapped_memory_win.cc | 2 +- src/poly/math.cc | 2 +- src/poly/math.h | 4 +-- src/poly/memory.cc | 2 +- src/poly/memory.h | 4 +-- src/poly/poly.h | 26 +++++++++---------- src/poly/string.cc | 2 +- src/poly/string.h | 2 +- src/poly/threading.cc | 2 +- src/poly/threading.h | 2 +- src/poly/threading_win.cc | 4 +-- src/poly/ui/control.cc | 4 +-- src/poly/ui/control.h | 4 +-- src/poly/ui/menu_item.cc | 2 +- src/poly/ui/menu_item.h | 4 +-- src/poly/ui/win32/win32_control.cc | 2 +- src/poly/ui/win32/win32_control.h | 2 +- src/poly/ui/win32/win32_loop.cc | 4 +-- src/poly/ui/win32/win32_loop.h | 4 +-- src/poly/ui/win32/win32_menu_item.cc | 2 +- src/poly/ui/win32/win32_menu_item.h | 2 +- src/poly/ui/win32/win32_window.cc | 4 +-- src/poly/ui/win32/win32_window.h | 4 +-- src/poly/ui/window.h | 6 ++--- src/xenia/apu/apu.cc | 8 +++--- src/xenia/apu/apu.h | 2 +- src/xenia/apu/audio_driver.cc | 8 +++--- src/xenia/apu/audio_driver.h | 6 ++--- src/xenia/apu/audio_system.cc | 12 ++++----- src/xenia/apu/audio_system.h | 6 ++--- src/xenia/apu/nop/nop_apu-private.h | 4 +-- src/xenia/apu/nop/nop_apu.cc | 4 +-- src/xenia/apu/nop/nop_apu.h | 2 +- src/xenia/apu/nop/nop_audio_system.cc | 4 +-- src/xenia/apu/nop/nop_audio_system.h | 6 ++--- src/xenia/apu/xaudio2/xaudio2_apu-private.h | 4 +-- src/xenia/apu/xaudio2/xaudio2_apu.cc | 4 +-- src/xenia/apu/xaudio2/xaudio2_apu.h | 2 +- src/xenia/apu/xaudio2/xaudio2_audio_driver.cc | 6 ++--- src/xenia/apu/xaudio2/xaudio2_audio_driver.h | 6 ++--- src/xenia/apu/xaudio2/xaudio2_audio_system.cc | 8 +++--- src/xenia/apu/xaudio2/xaudio2_audio_system.h | 6 ++--- src/xenia/common.h | 14 +++++----- src/xenia/cpu/cpu.cc | 2 +- src/xenia/cpu/cpu.h | 8 +++--- src/xenia/cpu/mmio_handler.cc | 4 +-- src/xenia/cpu/mmio_handler_win.cc | 2 +- src/xenia/cpu/processor.cc | 10 +++---- src/xenia/cpu/processor.h | 6 ++--- src/xenia/cpu/xenon_runtime.cc | 6 ++--- src/xenia/cpu/xenon_runtime.h | 10 +++---- src/xenia/cpu/xenon_thread_state.cc | 6 ++--- src/xenia/cpu/xenon_thread_state.h | 8 +++--- src/xenia/cpu/xex_module.cc | 10 +++---- src/xenia/cpu/xex_module.h | 6 ++--- src/xenia/debug_agent.cc | 4 +-- src/xenia/debug_agent.h | 2 +- src/xenia/emulator.cc | 26 +++++++++---------- src/xenia/emulator.h | 12 ++++----- src/xenia/export_resolver.cc | 4 +-- src/xenia/export_resolver.h | 2 +- src/xenia/gpu/gl4/circular_buffer.cc | 10 +++---- src/xenia/gpu/gl4/circular_buffer.h | 2 +- src/xenia/gpu/gl4/command_processor.cc | 20 +++++++------- src/xenia/gpu/gl4/command_processor.h | 16 ++++++------ src/xenia/gpu/gl4/draw_batcher.cc | 10 +++---- src/xenia/gpu/gl4/draw_batcher.h | 12 ++++----- src/xenia/gpu/gl4/gl4_gpu-private.h | 4 +-- src/xenia/gpu/gl4/gl4_gpu.cc | 6 ++--- src/xenia/gpu/gl4/gl4_gpu.h | 4 +-- src/xenia/gpu/gl4/gl4_graphics_system.cc | 12 ++++----- src/xenia/gpu/gl4/gl4_graphics_system.h | 10 +++---- src/xenia/gpu/gl4/gl4_profiler_display.cc | 10 +++---- src/xenia/gpu/gl4/gl4_profiler_display.h | 10 +++---- src/xenia/gpu/gl4/gl4_shader.cc | 12 ++++----- src/xenia/gpu/gl4/gl4_shader.h | 6 ++--- src/xenia/gpu/gl4/gl4_shader_translator.cc | 6 ++--- src/xenia/gpu/gl4/gl4_shader_translator.h | 12 ++++----- src/xenia/gpu/gl4/gl_context.cc | 12 ++++----- src/xenia/gpu/gl4/gl_context.h | 4 +-- src/xenia/gpu/gl4/texture_cache.cc | 8 +++--- src/xenia/gpu/gl4/texture_cache.h | 10 +++---- src/xenia/gpu/gl4/wgl_control.cc | 10 +++---- src/xenia/gpu/gl4/wgl_control.h | 8 +++--- src/xenia/gpu/gpu.cc | 6 ++--- src/xenia/gpu/gpu.h | 2 +- src/xenia/gpu/graphics_system.cc | 10 +++---- src/xenia/gpu/graphics_system.h | 6 ++--- src/xenia/gpu/register_file.cc | 4 +-- src/xenia/gpu/register_file.h | 4 +-- src/xenia/gpu/sampler_info.cc | 4 +-- src/xenia/gpu/sampler_info.h | 4 +-- src/xenia/gpu/shader.cc | 6 ++--- src/xenia/gpu/shader.h | 4 +-- src/xenia/gpu/texture_info.cc | 6 ++--- src/xenia/gpu/texture_info.h | 4 +-- src/xenia/gpu/ucode.h | 2 +- src/xenia/gpu/ucode_disassembler.cc | 2 +- src/xenia/gpu/ucode_disassembler.h | 4 +-- src/xenia/gpu/xenos.h | 4 +-- src/xenia/hid/hid.cc | 12 ++++----- src/xenia/hid/hid.h | 2 +- src/xenia/hid/input_driver.cc | 2 +- src/xenia/hid/input_driver.h | 4 +-- src/xenia/hid/input_system.cc | 8 +++--- src/xenia/hid/input_system.h | 6 ++--- src/xenia/hid/nop/nop_hid-private.h | 4 +-- src/xenia/hid/nop/nop_hid.cc | 4 +-- src/xenia/hid/nop/nop_hid.h | 2 +- src/xenia/hid/nop/nop_input_driver.cc | 4 +-- src/xenia/hid/nop/nop_input_driver.h | 6 ++--- src/xenia/hid/winkey/winkey_hid-private.h | 4 +-- src/xenia/hid/winkey/winkey_hid.cc | 4 +-- src/xenia/hid/winkey/winkey_hid.h | 2 +- src/xenia/hid/winkey/winkey_input_driver.cc | 4 +-- src/xenia/hid/winkey/winkey_input_driver.h | 6 ++--- src/xenia/hid/xinput/xinput_hid-private.h | 4 +-- src/xenia/hid/xinput/xinput_hid.cc | 4 +-- src/xenia/hid/xinput/xinput_hid.h | 2 +- src/xenia/hid/xinput/xinput_input_driver.cc | 4 +-- src/xenia/hid/xinput/xinput_input_driver.h | 6 ++--- src/xenia/kernel/app.cc | 4 +-- src/xenia/kernel/app.h | 6 ++--- src/xenia/kernel/apps/apps.cc | 4 +-- src/xenia/kernel/apps/apps.h | 6 ++--- src/xenia/kernel/apps/xmp_app.cc | 4 +-- src/xenia/kernel/apps/xmp_app.h | 6 ++--- src/xenia/kernel/async_request.cc | 6 ++--- src/xenia/kernel/async_request.h | 4 +-- src/xenia/kernel/dispatcher.cc | 6 ++--- src/xenia/kernel/dispatcher.h | 4 +-- src/xenia/kernel/fs/device.cc | 4 +-- src/xenia/kernel/fs/device.h | 4 +-- .../kernel/fs/devices/disc_image_device.cc | 8 +++--- .../kernel/fs/devices/disc_image_device.h | 6 ++--- .../kernel/fs/devices/disc_image_entry.cc | 6 ++--- .../kernel/fs/devices/disc_image_entry.h | 6 ++--- .../kernel/fs/devices/disc_image_file.cc | 8 +++--- src/xenia/kernel/fs/devices/disc_image_file.h | 4 +-- .../kernel/fs/devices/host_path_device.cc | 6 ++--- .../kernel/fs/devices/host_path_device.h | 4 +-- .../kernel/fs/devices/host_path_entry.cc | 6 ++--- src/xenia/kernel/fs/devices/host_path_entry.h | 4 +-- src/xenia/kernel/fs/devices/host_path_file.cc | 6 ++--- src/xenia/kernel/fs/devices/host_path_file.h | 4 +-- .../fs/devices/stfs_container_device.cc | 10 +++---- .../kernel/fs/devices/stfs_container_device.h | 6 ++--- .../kernel/fs/devices/stfs_container_entry.cc | 6 ++--- .../kernel/fs/devices/stfs_container_entry.h | 6 ++--- .../kernel/fs/devices/stfs_container_file.cc | 8 +++--- .../kernel/fs/devices/stfs_container_file.h | 4 +-- src/xenia/kernel/fs/entry.cc | 4 +-- src/xenia/kernel/fs/entry.h | 4 +-- src/xenia/kernel/fs/filesystem.cc | 10 +++---- src/xenia/kernel/fs/filesystem.h | 4 +-- src/xenia/kernel/fs/gdfx.cc | 4 +-- src/xenia/kernel/fs/gdfx.h | 8 +++--- src/xenia/kernel/fs/stfs.cc | 2 +- src/xenia/kernel/fs/stfs.h | 8 +++--- src/xenia/kernel/kernel.h | 2 +- src/xenia/kernel/kernel_state.cc | 26 +++++++++---------- src/xenia/kernel/kernel_state.h | 16 ++++++------ src/xenia/kernel/modules.h | 4 +-- src/xenia/kernel/native_list.cc | 2 +- src/xenia/kernel/native_list.h | 6 ++--- src/xenia/kernel/object_table.cc | 6 ++--- src/xenia/kernel/object_table.h | 4 +-- src/xenia/kernel/objects/xenumerator.cc | 2 +- src/xenia/kernel/objects/xenumerator.h | 4 +-- src/xenia/kernel/objects/xevent.cc | 2 +- src/xenia/kernel/objects/xevent.h | 4 +-- src/xenia/kernel/objects/xfile.cc | 6 ++--- src/xenia/kernel/objects/xfile.h | 4 +-- src/xenia/kernel/objects/xkernel_module.cc | 8 +++--- src/xenia/kernel/objects/xkernel_module.h | 4 +-- src/xenia/kernel/objects/xmodule.cc | 4 +-- src/xenia/kernel/objects/xmodule.h | 4 +-- src/xenia/kernel/objects/xmutant.cc | 2 +- src/xenia/kernel/objects/xmutant.h | 4 +-- src/xenia/kernel/objects/xnotify_listener.cc | 2 +- src/xenia/kernel/objects/xnotify_listener.h | 4 +-- src/xenia/kernel/objects/xsemaphore.cc | 2 +- src/xenia/kernel/objects/xsemaphore.h | 4 +-- src/xenia/kernel/objects/xthread.cc | 14 +++++----- src/xenia/kernel/objects/xthread.h | 6 ++--- src/xenia/kernel/objects/xtimer.cc | 4 +-- src/xenia/kernel/objects/xtimer.h | 4 +-- src/xenia/kernel/objects/xuser_module.cc | 10 +++---- src/xenia/kernel/objects/xuser_module.h | 8 +++--- src/xenia/kernel/user_profile.cc | 2 +- src/xenia/kernel/user_profile.h | 4 +-- src/xenia/kernel/util/export_table_pre.inc | 6 ++--- src/xenia/kernel/util/ordinal_table_pre.inc | 6 ++--- src/xenia/kernel/util/shim_utils.h | 6 ++--- src/xenia/kernel/util/xex2.cc | 16 ++++++------ src/xenia/kernel/util/xex2.h | 6 ++--- src/xenia/kernel/util/xex2_info.h | 2 +- src/xenia/kernel/xam_content.cc | 10 +++---- src/xenia/kernel/xam_info.cc | 14 +++++----- src/xenia/kernel/xam_input.cc | 14 +++++----- src/xenia/kernel/xam_module.cc | 16 ++++++------ src/xenia/kernel/xam_module.h | 8 +++--- src/xenia/kernel/xam_msg.cc | 12 ++++----- src/xenia/kernel/xam_net.cc | 10 +++---- src/xenia/kernel/xam_notify.cc | 12 ++++----- src/xenia/kernel/xam_ordinals.h | 10 +++---- src/xenia/kernel/xam_private.h | 4 +-- src/xenia/kernel/xam_ui.cc | 10 +++---- src/xenia/kernel/xam_user.cc | 14 +++++----- src/xenia/kernel/xam_video.cc | 10 +++---- src/xenia/kernel/xam_voice.cc | 12 ++++----- src/xenia/kernel/xboxkrnl_audio.cc | 14 +++++----- src/xenia/kernel/xboxkrnl_debug.cc | 12 ++++----- src/xenia/kernel/xboxkrnl_hal.cc | 10 +++---- src/xenia/kernel/xboxkrnl_io.cc | 18 ++++++------- src/xenia/kernel/xboxkrnl_memory.cc | 12 ++++----- src/xenia/kernel/xboxkrnl_misc.cc | 12 ++++----- src/xenia/kernel/xboxkrnl_module.cc | 20 +++++++------- src/xenia/kernel/xboxkrnl_module.h | 10 +++---- src/xenia/kernel/xboxkrnl_modules.cc | 14 +++++----- src/xenia/kernel/xboxkrnl_ob.cc | 14 +++++----- src/xenia/kernel/xboxkrnl_ordinals.h | 10 +++---- src/xenia/kernel/xboxkrnl_private.h | 4 +-- src/xenia/kernel/xboxkrnl_rtl.cc | 16 ++++++------ src/xenia/kernel/xboxkrnl_rtl.h | 4 +-- src/xenia/kernel/xboxkrnl_strings.cc | 16 ++++++------ src/xenia/kernel/xboxkrnl_threading.cc | 26 +++++++++---------- src/xenia/kernel/xboxkrnl_usbcam.cc | 10 +++---- src/xenia/kernel/xboxkrnl_video.cc | 20 +++++++------- src/xenia/kernel/xobject.cc | 10 +++---- src/xenia/kernel/xobject.h | 4 +-- src/xenia/logging.h | 2 +- src/xenia/memory.cc | 10 +++---- src/xenia/memory.h | 6 ++--- src/xenia/profiling.cc | 4 +-- src/xenia/profiling.h | 2 +- src/xenia/ui/main_window.cc | 8 +++--- src/xenia/ui/main_window.h | 8 +++--- src/xenia/xbox.h | 4 +-- src/xenia/xenia_main.cc | 8 +++--- 373 files changed, 1171 insertions(+), 1171 deletions(-) diff --git a/src/alloy/alloy.cc b/src/alloy/alloy.cc index e5b135a9e..2f6d095f3 100644 --- a/src/alloy/alloy.cc +++ b/src/alloy/alloy.cc @@ -7,8 +7,8 @@ ****************************************************************************** */ -#include -#include +#include "alloy/alloy.h" +#include "alloy/alloy-private.h" using namespace alloy; diff --git a/src/alloy/alloy.h b/src/alloy/alloy.h index 2b2d9f318..4f47028f0 100644 --- a/src/alloy/alloy.h +++ b/src/alloy/alloy.h @@ -10,9 +10,9 @@ #ifndef ALLOY_ALLOY_H_ #define ALLOY_ALLOY_H_ -#include -#include -#include -#include +#include "alloy/runtime/function.h" +#include "alloy/runtime/module.h" +#include "alloy/runtime/runtime.h" +#include "alloy/runtime/thread_state.h" #endif // ALLOY_ALLOY_H_ diff --git a/src/alloy/arena.cc b/src/alloy/arena.cc index 081467e72..b80c60a33 100644 --- a/src/alloy/arena.cc +++ b/src/alloy/arena.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "alloy/arena.h" -#include +#include "poly/poly.h" namespace alloy { diff --git a/src/alloy/backend/assembler.cc b/src/alloy/backend/assembler.cc index 6d5737692..b045fa615 100644 --- a/src/alloy/backend/assembler.cc +++ b/src/alloy/backend/assembler.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/backend/assembler.h" namespace alloy { namespace backend { diff --git a/src/alloy/backend/backend.cc b/src/alloy/backend/backend.cc index d66283c82..e0b1010ff 100644 --- a/src/alloy/backend/backend.cc +++ b/src/alloy/backend/backend.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/backend/backend.h" namespace alloy { namespace backend { diff --git a/src/alloy/backend/backend.h b/src/alloy/backend/backend.h index efa8371c1..ab7756252 100644 --- a/src/alloy/backend/backend.h +++ b/src/alloy/backend/backend.h @@ -12,7 +12,7 @@ #include -#include +#include "alloy/backend/machine_info.h" namespace alloy { namespace runtime { diff --git a/src/alloy/backend/x64/x64_assembler.cc b/src/alloy/backend/x64/x64_assembler.cc index a963b39e5..e57e85ef2 100644 --- a/src/alloy/backend/x64/x64_assembler.cc +++ b/src/alloy/backend/x64/x64_assembler.cc @@ -7,16 +7,16 @@ ****************************************************************************** */ -#include +#include "alloy/backend/x64/x64_assembler.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "alloy/reset_scope.h" +#include "alloy/backend/x64/x64_backend.h" +#include "alloy/backend/x64/x64_emitter.h" +#include "alloy/backend/x64/x64_function.h" +#include "alloy/hir/hir_builder.h" +#include "alloy/hir/label.h" +#include "alloy/runtime/runtime.h" +#include "xenia/profiling.h" namespace BE { #include diff --git a/src/alloy/backend/x64/x64_assembler.h b/src/alloy/backend/x64/x64_assembler.h index 03714e680..0eb9ad85e 100644 --- a/src/alloy/backend/x64/x64_assembler.h +++ b/src/alloy/backend/x64/x64_assembler.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "alloy/backend/assembler.h" +#include "alloy/string_buffer.h" namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_backend.cc b/src/alloy/backend/x64/x64_backend.cc index 32aed4d78..892795e9c 100644 --- a/src/alloy/backend/x64/x64_backend.cc +++ b/src/alloy/backend/x64/x64_backend.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "alloy/backend/x64/x64_backend.h" -#include -#include -#include -#include +#include "alloy/backend/x64/x64_assembler.h" +#include "alloy/backend/x64/x64_code_cache.h" +#include "alloy/backend/x64/x64_sequences.h" +#include "alloy/backend/x64/x64_thunk_emitter.h" namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_backend.h b/src/alloy/backend/x64/x64_backend.h index d285417f1..b6281ce2c 100644 --- a/src/alloy/backend/x64/x64_backend.h +++ b/src/alloy/backend/x64/x64_backend.h @@ -10,7 +10,7 @@ #ifndef ALLOY_BACKEND_X64_X64_BACKEND_H_ #define ALLOY_BACKEND_X64_X64_BACKEND_H_ -#include +#include "alloy/backend/backend.h" namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_code_cache_win.cc b/src/alloy/backend/x64/x64_code_cache_win.cc index 0b4a04c63..c8f336de8 100644 --- a/src/alloy/backend/x64/x64_code_cache_win.cc +++ b/src/alloy/backend/x64/x64_code_cache_win.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "alloy/backend/x64/x64_code_cache.h" -#include -#include +#include "poly/poly.h" +#include "xenia/profiling.h" namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_emitter.cc b/src/alloy/backend/x64/x64_emitter.cc index 79d904ea9..a404f52fc 100644 --- a/src/alloy/backend/x64/x64_emitter.cc +++ b/src/alloy/backend/x64/x64_emitter.cc @@ -7,20 +7,20 @@ ****************************************************************************** */ -#include +#include "alloy/backend/x64/x64_emitter.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "alloy/backend/x64/x64_backend.h" +#include "alloy/backend/x64/x64_code_cache.h" +#include "alloy/backend/x64/x64_function.h" +#include "alloy/backend/x64/x64_sequences.h" +#include "alloy/backend/x64/x64_thunk_emitter.h" +#include "alloy/hir/hir_builder.h" +#include "alloy/runtime/debug_info.h" +#include "alloy/runtime/runtime.h" +#include "alloy/runtime/symbol_info.h" +#include "alloy/runtime/thread_state.h" +#include "xdb/protocol.h" +#include "xenia/profiling.h" namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_emitter.h b/src/alloy/backend/x64/x64_emitter.h index 9245f408d..7cb529684 100644 --- a/src/alloy/backend/x64/x64_emitter.h +++ b/src/alloy/backend/x64/x64_emitter.h @@ -10,8 +10,8 @@ #ifndef ALLOY_BACKEND_X64_X64_EMITTER_H_ #define ALLOY_BACKEND_X64_X64_EMITTER_H_ -#include -#include +#include "alloy/hir/value.h" +#include "third_party/xbyak/xbyak/xbyak.h" namespace alloy { namespace hir { diff --git a/src/alloy/backend/x64/x64_function.cc b/src/alloy/backend/x64/x64_function.cc index 1b3cc9117..96468219d 100644 --- a/src/alloy/backend/x64/x64_function.cc +++ b/src/alloy/backend/x64/x64_function.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "alloy/backend/x64/x64_function.h" -#include -#include -#include +#include "alloy/backend/x64/x64_backend.h" +#include "alloy/runtime/runtime.h" +#include "alloy/runtime/thread_state.h" namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_function.h b/src/alloy/backend/x64/x64_function.h index 24d4af098..b78689364 100644 --- a/src/alloy/backend/x64/x64_function.h +++ b/src/alloy/backend/x64/x64_function.h @@ -10,8 +10,8 @@ #ifndef ALLOY_BACKEND_X64_X64_FUNCTION_H_ #define ALLOY_BACKEND_X64_X64_FUNCTION_H_ -#include -#include +#include "alloy/runtime/function.h" +#include "alloy/runtime/symbol_info.h" namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_sequences.cc b/src/alloy/backend/x64/x64_sequences.cc index fe422d8f0..2cef7ca64 100644 --- a/src/alloy/backend/x64/x64_sequences.cc +++ b/src/alloy/backend/x64/x64_sequences.cc @@ -22,12 +22,12 @@ // load into xmm register: // [0F 0E 0D 0C] [0B 0A 09 08] [07 06 05 04] [03 02 01 00] (w, z, y, x) -#include +#include "alloy/backend/x64/x64_sequences.h" -#include -#include -#include -#include +#include "alloy/backend/x64/x64_emitter.h" +#include "alloy/backend/x64/x64_tracers.h" +#include "alloy/hir/hir_builder.h" +#include "alloy/runtime/runtime.h" namespace alloy { namespace backend { @@ -43,7 +43,7 @@ typedef bool (*SequenceSelectFn)(X64Emitter&, const Instr*, const Instr**); std::unordered_multimap sequence_table; // Utilities/types used only in this file: -#include +#include "alloy/backend/x64/x64_sequence.inl" // Selects the right byte/word/etc from a vector. We need to flip logical // indices (0,1,2,3,4,5,6,7,...) = (3,2,1,0,7,6,5,4,...) diff --git a/src/alloy/backend/x64/x64_thunk_emitter.cc b/src/alloy/backend/x64/x64_thunk_emitter.cc index 999766662..054e41c02 100644 --- a/src/alloy/backend/x64/x64_thunk_emitter.cc +++ b/src/alloy/backend/x64/x64_thunk_emitter.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "alloy/backend/x64/x64_thunk_emitter.h" -#include +#include "third_party/xbyak/xbyak/xbyak.h" namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_thunk_emitter.h b/src/alloy/backend/x64/x64_thunk_emitter.h index b8b5c612d..e8a0d4903 100644 --- a/src/alloy/backend/x64/x64_thunk_emitter.h +++ b/src/alloy/backend/x64/x64_thunk_emitter.h @@ -10,8 +10,8 @@ #ifndef ALLOY_BACKEND_X64_X64_THUNK_EMITTER_H_ #define ALLOY_BACKEND_X64_X64_THUNK_EMITTER_H_ -#include -#include +#include "alloy/backend/x64/x64_backend.h" +#include "alloy/backend/x64/x64_emitter.h" namespace alloy { namespace backend { diff --git a/src/alloy/backend/x64/x64_tracers.cc b/src/alloy/backend/x64/x64_tracers.cc index 86b1948c2..aa51892fe 100644 --- a/src/alloy/backend/x64/x64_tracers.cc +++ b/src/alloy/backend/x64/x64_tracers.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "alloy/backend/x64/x64_tracers.h" -#include -#include -#include +#include "alloy/backend/x64/x64_emitter.h" +#include "alloy/runtime/runtime.h" +#include "alloy/runtime/thread_state.h" using namespace alloy; using namespace alloy::backend::x64; diff --git a/src/alloy/compiler/compiler.cc b/src/alloy/compiler/compiler.cc index 50b295803..fc03d8de4 100644 --- a/src/alloy/compiler/compiler.cc +++ b/src/alloy/compiler/compiler.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/compiler.h" -#include -#include +#include "alloy/compiler/compiler_pass.h" +#include "xenia/profiling.h" namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/compiler.h b/src/alloy/compiler/compiler.h index 1f1c911f9..15188f4d7 100644 --- a/src/alloy/compiler/compiler.h +++ b/src/alloy/compiler/compiler.h @@ -13,7 +13,7 @@ #include #include -#include +#include "alloy/hir/hir_builder.h" namespace alloy { namespace runtime { diff --git a/src/alloy/compiler/compiler_pass.cc b/src/alloy/compiler/compiler_pass.cc index 67ac1700f..bc6e580f7 100644 --- a/src/alloy/compiler/compiler_pass.cc +++ b/src/alloy/compiler/compiler_pass.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/compiler_pass.h" -#include +#include "alloy/compiler/compiler.h" namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/compiler_pass.h b/src/alloy/compiler/compiler_pass.h index f00aa42ab..14831665d 100644 --- a/src/alloy/compiler/compiler_pass.h +++ b/src/alloy/compiler/compiler_pass.h @@ -10,7 +10,7 @@ #ifndef ALLOY_COMPILER_COMPILER_PASS_H_ #define ALLOY_COMPILER_COMPILER_PASS_H_ -#include +#include "alloy/hir/hir_builder.h" namespace alloy { namespace runtime { diff --git a/src/alloy/compiler/compiler_passes.h b/src/alloy/compiler/compiler_passes.h index 935b8397b..83cd1b924 100644 --- a/src/alloy/compiler/compiler_passes.h +++ b/src/alloy/compiler/compiler_passes.h @@ -10,18 +10,18 @@ #ifndef ALLOY_COMPILER_COMPILER_PASSES_H_ #define ALLOY_COMPILER_COMPILER_PASSES_H_ -#include -#include -#include -#include -#include -#include -//#include -#include -#include -#include -#include -#include +#include "alloy/compiler/passes/constant_propagation_pass.h" +#include "alloy/compiler/passes/context_promotion_pass.h" +#include "alloy/compiler/passes/control_flow_analysis_pass.h" +#include "alloy/compiler/passes/control_flow_simplification_pass.h" +#include "alloy/compiler/passes/data_flow_analysis_pass.h" +#include "alloy/compiler/passes/dead_code_elimination_pass.h" +//#include "alloy/compiler/passes/dead_store_elimination_pass.h" +#include "alloy/compiler/passes/finalization_pass.h" +#include "alloy/compiler/passes/register_allocation_pass.h" +#include "alloy/compiler/passes/simplification_pass.h" +#include "alloy/compiler/passes/validation_pass.h" +#include "alloy/compiler/passes/value_reduction_pass.h" // TODO: // - mark_use/mark_set diff --git a/src/alloy/compiler/passes/constant_propagation_pass.cc b/src/alloy/compiler/passes/constant_propagation_pass.cc index 072530db9..29d1b1451 100644 --- a/src/alloy/compiler/passes/constant_propagation_pass.cc +++ b/src/alloy/compiler/passes/constant_propagation_pass.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/passes/constant_propagation_pass.h" -#include -#include -#include +#include "alloy/runtime/function.h" +#include "alloy/runtime/runtime.h" +#include "xenia/profiling.h" namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/constant_propagation_pass.h b/src/alloy/compiler/passes/constant_propagation_pass.h index ff7241e3e..7f5d4da96 100644 --- a/src/alloy/compiler/passes/constant_propagation_pass.h +++ b/src/alloy/compiler/passes/constant_propagation_pass.h @@ -10,7 +10,7 @@ #ifndef ALLOY_COMPILER_PASSES_CONSTANT_PROPAGATION_PASS_H_ #define ALLOY_COMPILER_PASSES_CONSTANT_PROPAGATION_PASS_H_ -#include +#include "alloy/compiler/compiler_pass.h" 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 1b47246c0..6b630b7ca 100644 --- a/src/alloy/compiler/passes/context_promotion_pass.cc +++ b/src/alloy/compiler/passes/context_promotion_pass.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/passes/context_promotion_pass.h" #include -#include -#include -#include +#include "alloy/compiler/compiler.h" +#include "alloy/runtime/runtime.h" +#include "xenia/profiling.h" DEFINE_bool(store_all_context_values, false, "Don't strip dead context stores to aid in debugging."); diff --git a/src/alloy/compiler/passes/context_promotion_pass.h b/src/alloy/compiler/passes/context_promotion_pass.h index db6480da7..07b192598 100644 --- a/src/alloy/compiler/passes/context_promotion_pass.h +++ b/src/alloy/compiler/passes/context_promotion_pass.h @@ -10,7 +10,7 @@ #ifndef ALLOY_COMPILER_PASSES_CONTEXT_PROMOTION_PASS_H_ #define ALLOY_COMPILER_PASSES_CONTEXT_PROMOTION_PASS_H_ -#include +#include "alloy/compiler/compiler_pass.h" #if XE_COMPILER_MSVC #pragma warning(push) diff --git a/src/alloy/compiler/passes/control_flow_analysis_pass.cc b/src/alloy/compiler/passes/control_flow_analysis_pass.cc index ce379cee6..3fd72c49b 100644 --- a/src/alloy/compiler/passes/control_flow_analysis_pass.cc +++ b/src/alloy/compiler/passes/control_flow_analysis_pass.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/passes/control_flow_analysis_pass.h" -#include -#include -#include -#include +#include "alloy/backend/backend.h" +#include "alloy/compiler/compiler.h" +#include "alloy/runtime/runtime.h" +#include "xenia/profiling.h" namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/control_flow_analysis_pass.h b/src/alloy/compiler/passes/control_flow_analysis_pass.h index bcde6cd5a..7354f0be5 100644 --- a/src/alloy/compiler/passes/control_flow_analysis_pass.h +++ b/src/alloy/compiler/passes/control_flow_analysis_pass.h @@ -10,7 +10,7 @@ #ifndef ALLOY_COMPILER_PASSES_CONTROL_FLOW_ANALYSIS_PASS_H_ #define ALLOY_COMPILER_PASSES_CONTROL_FLOW_ANALYSIS_PASS_H_ -#include +#include "alloy/compiler/compiler_pass.h" 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 1e404dbe1..89764b456 100644 --- a/src/alloy/compiler/passes/control_flow_simplification_pass.cc +++ b/src/alloy/compiler/passes/control_flow_simplification_pass.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/passes/control_flow_simplification_pass.h" -#include -#include -#include -#include +#include "alloy/backend/backend.h" +#include "alloy/compiler/compiler.h" +#include "alloy/runtime/runtime.h" +#include "xenia/profiling.h" namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/control_flow_simplification_pass.h b/src/alloy/compiler/passes/control_flow_simplification_pass.h index 350ed4d9d..4c79ac57d 100644 --- a/src/alloy/compiler/passes/control_flow_simplification_pass.h +++ b/src/alloy/compiler/passes/control_flow_simplification_pass.h @@ -10,7 +10,7 @@ #ifndef ALLOY_COMPILER_PASSES_CONTROL_FLOW_SIMPLIFICATION_PASS_H_ #define ALLOY_COMPILER_PASSES_CONTROL_FLOW_SIMPLIFICATION_PASS_H_ -#include +#include "alloy/compiler/compiler_pass.h" 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 b814f9260..8decd65f8 100644 --- a/src/alloy/compiler/passes/data_flow_analysis_pass.cc +++ b/src/alloy/compiler/passes/data_flow_analysis_pass.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/passes/data_flow_analysis_pass.h" -#include -#include -#include -#include +#include "alloy/backend/backend.h" +#include "alloy/compiler/compiler.h" +#include "alloy/runtime/runtime.h" +#include "xenia/profiling.h" #if XE_COMPILER_MSVC #pragma warning(push) diff --git a/src/alloy/compiler/passes/data_flow_analysis_pass.h b/src/alloy/compiler/passes/data_flow_analysis_pass.h index f3990b2ec..41ce04952 100644 --- a/src/alloy/compiler/passes/data_flow_analysis_pass.h +++ b/src/alloy/compiler/passes/data_flow_analysis_pass.h @@ -10,7 +10,7 @@ #ifndef ALLOY_COMPILER_PASSES_DATA_FLOW_ANALYSIS_PASS_H_ #define ALLOY_COMPILER_PASSES_DATA_FLOW_ANALYSIS_PASS_H_ -#include +#include "alloy/compiler/compiler_pass.h" namespace alloy { diff --git a/src/alloy/compiler/passes/dead_code_elimination_pass.cc b/src/alloy/compiler/passes/dead_code_elimination_pass.cc index b439edad3..3d36ce411 100644 --- a/src/alloy/compiler/passes/dead_code_elimination_pass.cc +++ b/src/alloy/compiler/passes/dead_code_elimination_pass.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/passes/dead_code_elimination_pass.h" -#include +#include "xenia/profiling.h" namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/dead_code_elimination_pass.h b/src/alloy/compiler/passes/dead_code_elimination_pass.h index 14d8667df..3350fb573 100644 --- a/src/alloy/compiler/passes/dead_code_elimination_pass.h +++ b/src/alloy/compiler/passes/dead_code_elimination_pass.h @@ -10,7 +10,7 @@ #ifndef ALLOY_COMPILER_PASSES_DEAD_CODE_ELIMINATION_PASS_H_ #define ALLOY_COMPILER_PASSES_DEAD_CODE_ELIMINATION_PASS_H_ -#include +#include "alloy/compiler/compiler_pass.h" namespace alloy { diff --git a/src/alloy/compiler/passes/finalization_pass.cc b/src/alloy/compiler/passes/finalization_pass.cc index 12e4254d7..0c3b96392 100644 --- a/src/alloy/compiler/passes/finalization_pass.cc +++ b/src/alloy/compiler/passes/finalization_pass.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/passes/finalization_pass.h" -#include -#include -#include -#include +#include "alloy/backend/backend.h" +#include "alloy/compiler/compiler.h" +#include "alloy/runtime/runtime.h" +#include "xenia/profiling.h" namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/finalization_pass.h b/src/alloy/compiler/passes/finalization_pass.h index cf951f706..1e5ca2b99 100644 --- a/src/alloy/compiler/passes/finalization_pass.h +++ b/src/alloy/compiler/passes/finalization_pass.h @@ -10,7 +10,7 @@ #ifndef ALLOY_COMPILER_PASSES_FINALIZATION_PASS_H_ #define ALLOY_COMPILER_PASSES_FINALIZATION_PASS_H_ -#include +#include "alloy/compiler/compiler_pass.h" 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 f388f90c1..3a1ce56c5 100644 --- a/src/alloy/compiler/passes/register_allocation_pass.cc +++ b/src/alloy/compiler/passes/register_allocation_pass.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/passes/register_allocation_pass.h" #include -#include +#include "xenia/profiling.h" namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/register_allocation_pass.h b/src/alloy/compiler/passes/register_allocation_pass.h index 6090ed527..c57a4da60 100644 --- a/src/alloy/compiler/passes/register_allocation_pass.h +++ b/src/alloy/compiler/passes/register_allocation_pass.h @@ -14,8 +14,8 @@ #include #include -#include -#include +#include "alloy/backend/machine_info.h" +#include "alloy/compiler/compiler_pass.h" namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/simplification_pass.cc b/src/alloy/compiler/passes/simplification_pass.cc index c1d73db6b..cbd2ee39a 100644 --- a/src/alloy/compiler/passes/simplification_pass.cc +++ b/src/alloy/compiler/passes/simplification_pass.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/passes/simplification_pass.h" -#include +#include "xenia/profiling.h" namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/simplification_pass.h b/src/alloy/compiler/passes/simplification_pass.h index 328e200a9..769a355fd 100644 --- a/src/alloy/compiler/passes/simplification_pass.h +++ b/src/alloy/compiler/passes/simplification_pass.h @@ -10,7 +10,7 @@ #ifndef ALLOY_COMPILER_PASSES_SIMPLIFICATION_PASS_H_ #define ALLOY_COMPILER_PASSES_SIMPLIFICATION_PASS_H_ -#include +#include "alloy/compiler/compiler_pass.h" namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/validation_pass.cc b/src/alloy/compiler/passes/validation_pass.cc index 9b6d209fb..f4650fdf0 100644 --- a/src/alloy/compiler/passes/validation_pass.cc +++ b/src/alloy/compiler/passes/validation_pass.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/passes/validation_pass.h" -#include -#include -#include -#include +#include "alloy/backend/backend.h" +#include "alloy/compiler/compiler.h" +#include "alloy/runtime/runtime.h" +#include "xenia/profiling.h" namespace alloy { namespace compiler { diff --git a/src/alloy/compiler/passes/validation_pass.h b/src/alloy/compiler/passes/validation_pass.h index 133187d6f..974e1da50 100644 --- a/src/alloy/compiler/passes/validation_pass.h +++ b/src/alloy/compiler/passes/validation_pass.h @@ -10,7 +10,7 @@ #ifndef ALLOY_COMPILER_PASSES_VALIDATION_PASS_H_ #define ALLOY_COMPILER_PASSES_VALIDATION_PASS_H_ -#include +#include "alloy/compiler/compiler_pass.h" 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 d46037fe0..46ade7351 100644 --- a/src/alloy/compiler/passes/value_reduction_pass.cc +++ b/src/alloy/compiler/passes/value_reduction_pass.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "alloy/compiler/passes/value_reduction_pass.h" -#include -#include -#include -#include +#include "alloy/backend/backend.h" +#include "alloy/compiler/compiler.h" +#include "alloy/runtime/runtime.h" +#include "xenia/profiling.h" #if XE_COMPILER_MSVC #pragma warning(push) diff --git a/src/alloy/compiler/passes/value_reduction_pass.h b/src/alloy/compiler/passes/value_reduction_pass.h index b2ea00bb7..430c02c18 100644 --- a/src/alloy/compiler/passes/value_reduction_pass.h +++ b/src/alloy/compiler/passes/value_reduction_pass.h @@ -10,7 +10,7 @@ #ifndef ALLOY_COMPILER_PASSES_VALUE_REDUCTION_PASS_H_ #define ALLOY_COMPILER_PASSES_VALUE_REDUCTION_PASS_H_ -#include +#include "alloy/compiler/compiler_pass.h" namespace alloy { namespace compiler { diff --git a/src/alloy/frontend/context_info.cc b/src/alloy/frontend/context_info.cc index f14109124..7917ff33f 100644 --- a/src/alloy/frontend/context_info.cc +++ b/src/alloy/frontend/context_info.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/context_info.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/frontend.cc b/src/alloy/frontend/frontend.cc index a9da0bfd7..c762a6225 100644 --- a/src/alloy/frontend/frontend.cc +++ b/src/alloy/frontend/frontend.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/frontend.h" -#include +#include "alloy/runtime/runtime.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/frontend.h b/src/alloy/frontend/frontend.h index 83d0f9839..5e8d4b346 100644 --- a/src/alloy/frontend/frontend.h +++ b/src/alloy/frontend/frontend.h @@ -12,10 +12,10 @@ #include -#include -#include -#include -#include +#include "alloy/frontend/context_info.h" +#include "alloy/memory.h" +#include "alloy/runtime/function.h" +#include "alloy/runtime/symbol_info.h" namespace alloy { namespace runtime { diff --git a/src/alloy/frontend/ppc/ppc_context.cc b/src/alloy/frontend/ppc/ppc_context.cc index ad94c95f2..f7a05715e 100644 --- a/src/alloy/frontend/ppc/ppc_context.cc +++ b/src/alloy/frontend/ppc/ppc_context.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/ppc/ppc_context.h" #include diff --git a/src/alloy/frontend/ppc/ppc_context.h b/src/alloy/frontend/ppc/ppc_context.h index 7fa490c96..a5c5f3719 100644 --- a/src/alloy/frontend/ppc/ppc_context.h +++ b/src/alloy/frontend/ppc/ppc_context.h @@ -10,8 +10,8 @@ #ifndef ALLOY_FRONTEND_PPC_PPC_CONTEXT_H_ #define ALLOY_FRONTEND_PPC_PPC_CONTEXT_H_ -#include -#include +#include "alloy/vec128.h" +#include "poly/poly.h" namespace alloy { namespace runtime { class Runtime; diff --git a/src/alloy/frontend/ppc/ppc_disasm.cc b/src/alloy/frontend/ppc/ppc_disasm.cc index 54746b335..3ba0fce8d 100644 --- a/src/alloy/frontend/ppc/ppc_disasm.cc +++ b/src/alloy/frontend/ppc/ppc_disasm.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/ppc/ppc_disasm.h" -#include -#include +#include "poly/poly.h" +#include "alloy/string_buffer.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_disasm.h b/src/alloy/frontend/ppc/ppc_disasm.h index fe6c26be6..89e232349 100644 --- a/src/alloy/frontend/ppc/ppc_disasm.h +++ b/src/alloy/frontend/ppc/ppc_disasm.h @@ -10,7 +10,7 @@ #ifndef ALLOY_FRONTEND_PPC_PPC_DISASM_H_ #define ALLOY_FRONTEND_PPC_PPC_DISASM_H_ -#include +#include "alloy/frontend/ppc/ppc_instr.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_emit-private.h b/src/alloy/frontend/ppc/ppc_emit-private.h index 3acb10ffe..a0f7dcee5 100644 --- a/src/alloy/frontend/ppc/ppc_emit-private.h +++ b/src/alloy/frontend/ppc/ppc_emit-private.h @@ -10,8 +10,8 @@ #ifndef ALLOY_FRONTEND_PPC_PPC_EMIT_PRIVATE_H_ #define ALLOY_FRONTEND_PPC_PPC_EMIT_PRIVATE_H_ -#include -#include +#include "alloy/frontend/ppc/ppc_emit.h" +#include "alloy/frontend/ppc/ppc_instr.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_emit.h b/src/alloy/frontend/ppc/ppc_emit.h index 4edc4e021..18aa6959f 100644 --- a/src/alloy/frontend/ppc/ppc_emit.h +++ b/src/alloy/frontend/ppc/ppc_emit.h @@ -10,7 +10,7 @@ #ifndef ALLOY_FRONTEND_PPC_PPC_EMIT_H_ #define ALLOY_FRONTEND_PPC_PPC_EMIT_H_ -#include +#include "alloy/frontend/ppc/ppc_instr.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_emit_altivec.cc b/src/alloy/frontend/ppc/ppc_emit_altivec.cc index 381634af0..a581a4c40 100644 --- a/src/alloy/frontend/ppc/ppc_emit_altivec.cc +++ b/src/alloy/frontend/ppc/ppc_emit_altivec.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/ppc/ppc_emit-private.h" -#include -#include +#include "alloy/frontend/ppc/ppc_context.h" +#include "alloy/frontend/ppc/ppc_hir_builder.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_emit_alu.cc b/src/alloy/frontend/ppc/ppc_emit_alu.cc index fb37b2e69..3a3e95472 100644 --- a/src/alloy/frontend/ppc/ppc_emit_alu.cc +++ b/src/alloy/frontend/ppc/ppc_emit_alu.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/ppc/ppc_emit-private.h" -#include -#include +#include "alloy/frontend/ppc/ppc_context.h" +#include "alloy/frontend/ppc/ppc_hir_builder.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_emit_control.cc b/src/alloy/frontend/ppc/ppc_emit_control.cc index 49f1a62ff..8e00b3d24 100644 --- a/src/alloy/frontend/ppc/ppc_emit_control.cc +++ b/src/alloy/frontend/ppc/ppc_emit_control.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/ppc/ppc_emit-private.h" -#include -#include +#include "alloy/frontend/ppc/ppc_context.h" +#include "alloy/frontend/ppc/ppc_hir_builder.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_emit_fpu.cc b/src/alloy/frontend/ppc/ppc_emit_fpu.cc index 750054347..cc3eeeb28 100644 --- a/src/alloy/frontend/ppc/ppc_emit_fpu.cc +++ b/src/alloy/frontend/ppc/ppc_emit_fpu.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/ppc/ppc_emit-private.h" -#include -#include +#include "alloy/frontend/ppc/ppc_context.h" +#include "alloy/frontend/ppc/ppc_hir_builder.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_emit_memory.cc b/src/alloy/frontend/ppc/ppc_emit_memory.cc index f0f63ac52..c95c133e7 100644 --- a/src/alloy/frontend/ppc/ppc_emit_memory.cc +++ b/src/alloy/frontend/ppc/ppc_emit_memory.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/ppc/ppc_emit-private.h" -#include -#include +#include "alloy/frontend/ppc/ppc_context.h" +#include "alloy/frontend/ppc/ppc_hir_builder.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_frontend.cc b/src/alloy/frontend/ppc/ppc_frontend.cc index bc959a0d6..44dd08101 100644 --- a/src/alloy/frontend/ppc/ppc_frontend.cc +++ b/src/alloy/frontend/ppc/ppc_frontend.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/ppc/ppc_frontend.h" -#include -#include -#include -#include -#include +#include "alloy/frontend/ppc/ppc_context.h" +#include "alloy/frontend/ppc/ppc_disasm.h" +#include "alloy/frontend/ppc/ppc_emit.h" +#include "alloy/frontend/ppc/ppc_translator.h" +#include "alloy/runtime/runtime.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_frontend.h b/src/alloy/frontend/ppc/ppc_frontend.h index 425e0318d..cec21f286 100644 --- a/src/alloy/frontend/ppc/ppc_frontend.h +++ b/src/alloy/frontend/ppc/ppc_frontend.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "alloy/frontend/frontend.h" +#include "alloy/type_pool.h" 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 06294a54c..a1abfb415 100644 --- a/src/alloy/frontend/ppc/ppc_hir_builder.cc +++ b/src/alloy/frontend/ppc/ppc_hir_builder.cc @@ -7,16 +7,16 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/ppc/ppc_hir_builder.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "alloy/alloy-private.h" +#include "alloy/frontend/ppc/ppc_context.h" +#include "alloy/frontend/ppc/ppc_disasm.h" +#include "alloy/frontend/ppc/ppc_frontend.h" +#include "alloy/frontend/ppc/ppc_instr.h" +#include "alloy/hir/label.h" +#include "alloy/runtime/runtime.h" +#include "xenia/profiling.h" 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 55a3bd9ca..5fb172d96 100644 --- a/src/alloy/frontend/ppc/ppc_hir_builder.h +++ b/src/alloy/frontend/ppc/ppc_hir_builder.h @@ -10,10 +10,10 @@ #ifndef ALLOY_FRONTEND_PPC_PPC_HIR_BUILDER_H_ #define ALLOY_FRONTEND_PPC_PPC_HIR_BUILDER_H_ -#include -#include -#include -#include +#include "alloy/hir/hir_builder.h" +#include "alloy/runtime/function.h" +#include "alloy/runtime/symbol_info.h" +#include "alloy/string_buffer.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_instr.cc b/src/alloy/frontend/ppc/ppc_instr.cc index 04da51c9a..5551d9cd0 100644 --- a/src/alloy/frontend/ppc/ppc_instr.cc +++ b/src/alloy/frontend/ppc/ppc_instr.cc @@ -7,14 +7,14 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/ppc/ppc_instr.h" #include #include -#include -#include -#include +#include "alloy/frontend/ppc/ppc_instr_tables.h" +#include "alloy/string_buffer.h" +#include "poly/poly.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_instr_tables.h b/src/alloy/frontend/ppc/ppc_instr_tables.h index dec760993..26fa9815b 100644 --- a/src/alloy/frontend/ppc/ppc_instr_tables.h +++ b/src/alloy/frontend/ppc/ppc_instr_tables.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "alloy/frontend/ppc/ppc_instr.h" +#include "poly/poly.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_scanner.cc b/src/alloy/frontend/ppc/ppc_scanner.cc index 2ff120ea7..c45521c3d 100644 --- a/src/alloy/frontend/ppc/ppc_scanner.cc +++ b/src/alloy/frontend/ppc/ppc_scanner.cc @@ -7,17 +7,17 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/ppc/ppc_scanner.h" #include #include -#include -#include -#include -#include -#include -#include +#include "alloy/frontend/ppc/ppc_frontend.h" +#include "alloy/frontend/ppc/ppc_instr.h" +#include "alloy/runtime/runtime.h" +#include "poly/logging.h" +#include "poly/memory.h" +#include "xenia/profiling.h" #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 1eddcfd35..556c4df96 100644 --- a/src/alloy/frontend/ppc/ppc_scanner.h +++ b/src/alloy/frontend/ppc/ppc_scanner.h @@ -12,7 +12,7 @@ #include -#include +#include "alloy/runtime/symbol_info.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_translator.cc b/src/alloy/frontend/ppc/ppc_translator.cc index 1b21c386d..8b3fc152f 100644 --- a/src/alloy/frontend/ppc/ppc_translator.cc +++ b/src/alloy/frontend/ppc/ppc_translator.cc @@ -7,18 +7,18 @@ ****************************************************************************** */ -#include +#include "alloy/frontend/ppc/ppc_translator.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "alloy/alloy-private.h" +#include "alloy/compiler/compiler_passes.h" +#include "alloy/frontend/ppc/ppc_disasm.h" +#include "alloy/frontend/ppc/ppc_frontend.h" +#include "alloy/frontend/ppc/ppc_hir_builder.h" +#include "alloy/frontend/ppc/ppc_instr.h" +#include "alloy/frontend/ppc/ppc_scanner.h" +#include "alloy/reset_scope.h" +#include "alloy/runtime/runtime.h" +#include "xenia/profiling.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/ppc_translator.h b/src/alloy/frontend/ppc/ppc_translator.h index a24ddbb46..d18dbb1a6 100644 --- a/src/alloy/frontend/ppc/ppc_translator.h +++ b/src/alloy/frontend/ppc/ppc_translator.h @@ -12,10 +12,10 @@ #include -#include -#include -#include -#include +#include "alloy/backend/assembler.h" +#include "alloy/compiler/compiler.h" +#include "alloy/runtime/symbol_info.h" +#include "alloy/string_buffer.h" namespace alloy { namespace frontend { diff --git a/src/alloy/frontend/ppc/test/alloy-ppc-test.cc b/src/alloy/frontend/ppc/test/alloy-ppc-test.cc index 9190eaccd..21a191674 100644 --- a/src/alloy/frontend/ppc/test/alloy-ppc-test.cc +++ b/src/alloy/frontend/ppc/test/alloy-ppc-test.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include -#include +#include "alloy/alloy.h" +#include "alloy/backend/x64/x64_backend.h" +#include "alloy/frontend/ppc/ppc_context.h" +#include "alloy/frontend/ppc/ppc_frontend.h" +#include "alloy/runtime/raw_module.h" +#include "poly/main.h" +#include "poly/poly.h" #if !XE_LIKE_WIN32 #include diff --git a/src/alloy/hir/block.cc b/src/alloy/hir/block.cc index 0327c3163..41d9b5078 100644 --- a/src/alloy/hir/block.cc +++ b/src/alloy/hir/block.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "alloy/hir/block.h" -#include +#include "alloy/hir/instr.h" namespace alloy { namespace hir { diff --git a/src/alloy/hir/block.h b/src/alloy/hir/block.h index 70f11cac2..668b5e7f7 100644 --- a/src/alloy/hir/block.h +++ b/src/alloy/hir/block.h @@ -10,7 +10,7 @@ #ifndef ALLOY_HIR_BLOCK_H_ #define ALLOY_HIR_BLOCK_H_ -#include +#include "alloy/arena.h" namespace llvm { class BitVector; diff --git a/src/alloy/hir/hir_builder.cc b/src/alloy/hir/hir_builder.cc index c981d6915..06ddda5b4 100644 --- a/src/alloy/hir/hir_builder.cc +++ b/src/alloy/hir/hir_builder.cc @@ -7,14 +7,14 @@ ****************************************************************************** */ -#include +#include "alloy/hir/hir_builder.h" -#include -#include -#include -#include -#include -#include +#include "alloy/hir/block.h" +#include "alloy/hir/instr.h" +#include "alloy/hir/label.h" +#include "alloy/runtime/symbol_info.h" +#include "alloy/string_buffer.h" +#include "xenia/profiling.h" namespace alloy { namespace hir { diff --git a/src/alloy/hir/hir_builder.h b/src/alloy/hir/hir_builder.h index 71cc4ea6d..96862fc37 100644 --- a/src/alloy/hir/hir_builder.h +++ b/src/alloy/hir/hir_builder.h @@ -12,11 +12,11 @@ #include -#include -#include -#include -#include -#include +#include "alloy/hir/block.h" +#include "alloy/hir/instr.h" +#include "alloy/hir/label.h" +#include "alloy/hir/opcodes.h" +#include "alloy/hir/value.h" namespace alloy { class StringBuffer; diff --git a/src/alloy/hir/instr.cc b/src/alloy/hir/instr.cc index 20271c016..fccd93479 100644 --- a/src/alloy/hir/instr.cc +++ b/src/alloy/hir/instr.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "alloy/hir/instr.h" -#include +#include "alloy/hir/block.h" namespace alloy { namespace hir { diff --git a/src/alloy/hir/instr.h b/src/alloy/hir/instr.h index 259ef843b..df676afba 100644 --- a/src/alloy/hir/instr.h +++ b/src/alloy/hir/instr.h @@ -10,8 +10,8 @@ #ifndef ALLOY_HIR_INSTR_H_ #define ALLOY_HIR_INSTR_H_ -#include -#include +#include "alloy/hir/opcodes.h" +#include "alloy/hir/value.h" namespace alloy { namespace runtime { diff --git a/src/alloy/hir/opcodes.cc b/src/alloy/hir/opcodes.cc index df922c493..f7349887f 100644 --- a/src/alloy/hir/opcodes.cc +++ b/src/alloy/hir/opcodes.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/hir/opcodes.h" namespace alloy { namespace hir { @@ -16,7 +16,7 @@ namespace hir { const OpcodeInfo num##_info = { \ flags, sig, name, num, \ }; -#include +#include "alloy/hir/opcodes.inl" #undef DEFINE_OPCODE } // namespace hir diff --git a/src/alloy/hir/opcodes.h b/src/alloy/hir/opcodes.h index 60aaff61f..f5b9a215b 100644 --- a/src/alloy/hir/opcodes.h +++ b/src/alloy/hir/opcodes.h @@ -285,7 +285,7 @@ typedef struct { } OpcodeInfo; #define DEFINE_OPCODE(num, name, sig, flags) extern const OpcodeInfo num##_info; -#include +#include "alloy/hir/opcodes.inl" #undef DEFINE_OPCODE } // namespace hir diff --git a/src/alloy/hir/value.cc b/src/alloy/hir/value.cc index ae90900d4..b118bcf31 100644 --- a/src/alloy/hir/value.cc +++ b/src/alloy/hir/value.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/hir/value.h" #include diff --git a/src/alloy/hir/value.h b/src/alloy/hir/value.h index 0b1fc38ad..58ada49f3 100644 --- a/src/alloy/hir/value.h +++ b/src/alloy/hir/value.h @@ -10,11 +10,11 @@ #ifndef ALLOY_HIR_VALUE_H_ #define ALLOY_HIR_VALUE_H_ -#include -#include -#include -#include -#include +#include "alloy/arena.h" +#include "alloy/backend/machine_info.h" +#include "alloy/hir/opcodes.h" +#include "alloy/vec128.h" +#include "poly/poly.h" namespace alloy { namespace hir { diff --git a/src/alloy/memory.cc b/src/alloy/memory.cc index 36d1ac05f..c5680443b 100644 --- a/src/alloy/memory.cc +++ b/src/alloy/memory.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "alloy/memory.h" -#include +#include "poly/poly.h" namespace alloy { diff --git a/src/alloy/runtime/debug_info.cc b/src/alloy/runtime/debug_info.cc index 6a34e4238..5cb9bf0a6 100644 --- a/src/alloy/runtime/debug_info.cc +++ b/src/alloy/runtime/debug_info.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/runtime/debug_info.h" #include diff --git a/src/alloy/runtime/debugger.cc b/src/alloy/runtime/debugger.cc index a5c129fc8..2ef43f231 100644 --- a/src/alloy/runtime/debugger.cc +++ b/src/alloy/runtime/debugger.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "alloy/runtime/debugger.h" #include -#include +#include "alloy/runtime/runtime.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/debugger.h b/src/alloy/runtime/debugger.h index 6100ae7e1..a10eaddf0 100644 --- a/src/alloy/runtime/debugger.h +++ b/src/alloy/runtime/debugger.h @@ -15,7 +15,7 @@ #include #include -#include +#include "poly/delegate.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/entry_table.cc b/src/alloy/runtime/entry_table.cc index b309bbc15..96c97132d 100644 --- a/src/alloy/runtime/entry_table.cc +++ b/src/alloy/runtime/entry_table.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "alloy/runtime/entry_table.h" -#include -#include +#include "poly/poly.h" +#include "xenia/profiling.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/function.cc b/src/alloy/runtime/function.cc index 7f863ed29..2fee66490 100644 --- a/src/alloy/runtime/function.cc +++ b/src/alloy/runtime/function.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "alloy/runtime/function.h" -#include -#include -#include -#include +#include "alloy/runtime/debugger.h" +#include "alloy/runtime/symbol_info.h" +#include "alloy/runtime/thread_state.h" +#include "xdb/protocol.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/function.h b/src/alloy/runtime/function.h index c244813a9..6400cc4aa 100644 --- a/src/alloy/runtime/function.h +++ b/src/alloy/runtime/function.h @@ -14,7 +14,7 @@ #include #include -#include +#include "alloy/runtime/debug_info.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/instrument.cc b/src/alloy/runtime/instrument.cc index 8cb099fe6..939348997 100644 --- a/src/alloy/runtime/instrument.cc +++ b/src/alloy/runtime/instrument.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "alloy/runtime/instrument.h" -#include -#include -#include +#include "alloy/memory.h" +#include "alloy/runtime/function.h" +#include "alloy/runtime/runtime.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/module.cc b/src/alloy/runtime/module.cc index 7278b9c1b..3d9dbd0b6 100644 --- a/src/alloy/runtime/module.cc +++ b/src/alloy/runtime/module.cc @@ -7,14 +7,14 @@ ****************************************************************************** */ -#include +#include "alloy/runtime/module.h" #include #include -#include -#include -#include +#include "alloy/runtime/runtime.h" +#include "poly/poly.h" +#include "xenia/profiling.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/module.h b/src/alloy/runtime/module.h index 6bd50b6f0..671743bdf 100644 --- a/src/alloy/runtime/module.h +++ b/src/alloy/runtime/module.h @@ -16,8 +16,8 @@ #include #include -#include -#include +#include "alloy/memory.h" +#include "alloy/runtime/symbol_info.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/raw_module.cc b/src/alloy/runtime/raw_module.cc index 2750a724e..9eaed2ba4 100644 --- a/src/alloy/runtime/raw_module.cc +++ b/src/alloy/runtime/raw_module.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "alloy/runtime/raw_module.h" -#include -#include +#include "poly/platform.h" +#include "poly/string.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/raw_module.h b/src/alloy/runtime/raw_module.h index c40359f1e..af9eb6aed 100644 --- a/src/alloy/runtime/raw_module.h +++ b/src/alloy/runtime/raw_module.h @@ -12,7 +12,7 @@ #include -#include +#include "alloy/runtime/module.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/runtime.cc b/src/alloy/runtime/runtime.cc index 5da4970da..f3e3ba7c1 100644 --- a/src/alloy/runtime/runtime.cc +++ b/src/alloy/runtime/runtime.cc @@ -7,17 +7,17 @@ ****************************************************************************** */ -#include +#include "alloy/runtime/runtime.h" #include -#include -#include -#include -#include +#include "alloy/runtime/module.h" +#include "poly/poly.h" +#include "xdb/protocol.h" +#include "xenia/profiling.h" // TODO(benvanik): based on compiler support -#include +#include "alloy/backend/x64/x64_backend.h" DEFINE_string(runtime_backend, "any", "Runtime backend [any, x64]."); diff --git a/src/alloy/runtime/runtime.h b/src/alloy/runtime/runtime.h index 0d0e6312b..cc572ac70 100644 --- a/src/alloy/runtime/runtime.h +++ b/src/alloy/runtime/runtime.h @@ -14,14 +14,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "alloy/backend/backend.h" +#include "alloy/frontend/frontend.h" +#include "alloy/memory.h" +#include "alloy/runtime/debugger.h" +#include "alloy/runtime/entry_table.h" +#include "alloy/runtime/module.h" +#include "alloy/runtime/symbol_info.h" +#include "alloy/runtime/thread_state.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/symbol_info.cc b/src/alloy/runtime/symbol_info.cc index b525bf841..968534f4b 100644 --- a/src/alloy/runtime/symbol_info.cc +++ b/src/alloy/runtime/symbol_info.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/runtime/symbol_info.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/test_module.cc b/src/alloy/runtime/test_module.cc index 8ed766217..ce204ff65 100644 --- a/src/alloy/runtime/test_module.cc +++ b/src/alloy/runtime/test_module.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include +#include "alloy/runtime/test_module.h" -#include -#include -#include -#include -#include +#include "alloy/compiler/compiler_passes.h" +#include "alloy/reset_scope.h" +#include "alloy/runtime/runtime.h" +#include "poly/platform.h" +#include "poly/string.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/test_module.h b/src/alloy/runtime/test_module.h index 822509e40..fc78bd2c0 100644 --- a/src/alloy/runtime/test_module.h +++ b/src/alloy/runtime/test_module.h @@ -14,10 +14,10 @@ #include #include -#include -#include -#include -#include +#include "alloy/backend/assembler.h" +#include "alloy/compiler/compiler.h" +#include "alloy/hir/hir_builder.h" +#include "alloy/runtime/module.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/thread_state.cc b/src/alloy/runtime/thread_state.cc index 80b5ad71a..2c8e28a45 100644 --- a/src/alloy/runtime/thread_state.cc +++ b/src/alloy/runtime/thread_state.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "alloy/runtime/thread_state.h" -#include -#include +#include "alloy/runtime/runtime.h" +#include "poly/poly.h" namespace alloy { namespace runtime { diff --git a/src/alloy/runtime/thread_state.h b/src/alloy/runtime/thread_state.h index 012f0bf6f..9e91ff5d7 100644 --- a/src/alloy/runtime/thread_state.h +++ b/src/alloy/runtime/thread_state.h @@ -12,7 +12,7 @@ #include -#include +#include "alloy/memory.h" namespace alloy { namespace runtime { diff --git a/src/alloy/string_buffer.cc b/src/alloy/string_buffer.cc index 912690fdc..bd2f9d35b 100644 --- a/src/alloy/string_buffer.cc +++ b/src/alloy/string_buffer.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/string_buffer.h" #include #include diff --git a/src/alloy/test/alloy-test.cc b/src/alloy/test/alloy-test.cc index 24e88e428..6c493ce05 100644 --- a/src/alloy/test/alloy-test.cc +++ b/src/alloy/test/alloy-test.cc @@ -8,9 +8,9 @@ */ #define CATCH_CONFIG_RUNNER -#include +#include "third_party/catch/single_include/catch.hpp" -#include +#include "alloy/test/util.h" namespace alloy { namespace test { diff --git a/src/alloy/test/test_add.cc b/src/alloy/test/test_add.cc index 480874011..21c5649b1 100644 --- a/src/alloy/test/test_add.cc +++ b/src/alloy/test/test_add.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" #include diff --git a/src/alloy/test/test_byte_swap.cc b/src/alloy/test/test_byte_swap.cc index 03131d031..74154275b 100644 --- a/src/alloy/test/test_byte_swap.cc +++ b/src/alloy/test/test_byte_swap.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/test_extract.cc b/src/alloy/test/test_extract.cc index 6090b1744..3dacd2e89 100644 --- a/src/alloy/test/test_extract.cc +++ b/src/alloy/test/test_extract.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" #include diff --git a/src/alloy/test/test_insert.cc b/src/alloy/test/test_insert.cc index 5bd9a756b..811a6b93a 100644 --- a/src/alloy/test/test_insert.cc +++ b/src/alloy/test/test_insert.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" #include diff --git a/src/alloy/test/test_load_vector_shl_shr.cc b/src/alloy/test/test_load_vector_shl_shr.cc index 508dff9d0..9d6d790db 100644 --- a/src/alloy/test/test_load_vector_shl_shr.cc +++ b/src/alloy/test/test_load_vector_shl_shr.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/test_pack.cc b/src/alloy/test/test_pack.cc index 4dc82f509..c6547b557 100644 --- a/src/alloy/test/test_pack.cc +++ b/src/alloy/test/test_pack.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/test_permute.cc b/src/alloy/test/test_permute.cc index 8b2f7b6a8..58192331d 100644 --- a/src/alloy/test/test_permute.cc +++ b/src/alloy/test/test_permute.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/test_sha.cc b/src/alloy/test/test_sha.cc index 65f4d8553..9ed155afd 100644 --- a/src/alloy/test/test_sha.cc +++ b/src/alloy/test/test_sha.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/test_shl.cc b/src/alloy/test/test_shl.cc index 7d22b8af1..31dc1d772 100644 --- a/src/alloy/test/test_shl.cc +++ b/src/alloy/test/test_shl.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/test_shr.cc b/src/alloy/test/test_shr.cc index d79237000..81bd55afc 100644 --- a/src/alloy/test/test_shr.cc +++ b/src/alloy/test/test_shr.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/test_swizzle.cc b/src/alloy/test/test_swizzle.cc index 04d9e4ec9..be6874701 100644 --- a/src/alloy/test/test_swizzle.cc +++ b/src/alloy/test/test_swizzle.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/test_unpack.cc b/src/alloy/test/test_unpack.cc index f419419b1..14557124c 100644 --- a/src/alloy/test/test_unpack.cc +++ b/src/alloy/test/test_unpack.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/test_vector_add.cc b/src/alloy/test/test_vector_add.cc index 526e3e0a5..b23cc7ac1 100644 --- a/src/alloy/test/test_vector_add.cc +++ b/src/alloy/test/test_vector_add.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" #include diff --git a/src/alloy/test/test_vector_max.cc b/src/alloy/test/test_vector_max.cc index ebf858cc7..0d7ddfd71 100644 --- a/src/alloy/test/test_vector_max.cc +++ b/src/alloy/test/test_vector_max.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" #include diff --git a/src/alloy/test/test_vector_min.cc b/src/alloy/test/test_vector_min.cc index dfa08f8db..6f981badf 100644 --- a/src/alloy/test/test_vector_min.cc +++ b/src/alloy/test/test_vector_min.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" #include diff --git a/src/alloy/test/test_vector_rotate_left.cc b/src/alloy/test/test_vector_rotate_left.cc index 1c8e19d5e..9d46ad7b9 100644 --- a/src/alloy/test/test_vector_rotate_left.cc +++ b/src/alloy/test/test_vector_rotate_left.cc @@ -7,8 +7,8 @@ ****************************************************************************** */ -#include -#include +#include "third_party/xbyak/xbyak/xbyak_bin2hex.h" +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/test_vector_sha.cc b/src/alloy/test/test_vector_sha.cc index ebd2f535b..38a2accb6 100644 --- a/src/alloy/test/test_vector_sha.cc +++ b/src/alloy/test/test_vector_sha.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/test_vector_shl.cc b/src/alloy/test/test_vector_shl.cc index 45313427a..cda54e5b7 100644 --- a/src/alloy/test/test_vector_shl.cc +++ b/src/alloy/test/test_vector_shl.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/test_vector_shr.cc b/src/alloy/test/test_vector_shr.cc index d749197ef..1a73b9ec8 100644 --- a/src/alloy/test/test_vector_shr.cc +++ b/src/alloy/test/test_vector_shr.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "alloy/test/util.h" using namespace alloy; using namespace alloy::hir; diff --git a/src/alloy/test/util.h b/src/alloy/test/util.h index a38692f0f..46267e498 100644 --- a/src/alloy/test/util.h +++ b/src/alloy/test/util.h @@ -10,16 +10,16 @@ #ifndef ALLOY_TEST_UTIL_H_ #define ALLOY_TEST_UTIL_H_ -#include -#include -#include -#include -#include -#include -#include -#include +#include "alloy/alloy.h" +#include "alloy/backend/x64/x64_backend.h" +#include "alloy/frontend/ppc/ppc_context.h" +#include "alloy/frontend/ppc/ppc_frontend.h" +#include "alloy/hir/hir_builder.h" +#include "alloy/runtime/test_module.h" +#include "poly/main.h" +#include "poly/poly.h" -#include +#include "third_party/catch/single_include/catch.hpp" #define ALLOY_TEST_X64 1 diff --git a/src/alloy/vec128.h b/src/alloy/vec128.h index f756f805e..391178550 100644 --- a/src/alloy/vec128.h +++ b/src/alloy/vec128.h @@ -10,7 +10,7 @@ #ifndef ALLOY_VEC128_H_ #define ALLOY_VEC128_H_ -#include +#include "poly/poly.h" namespace alloy { diff --git a/src/poly/assert.h b/src/poly/assert.h index 596dc2363..1063e84e5 100644 --- a/src/poly/assert.h +++ b/src/poly/assert.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "poly/config.h" +#include "poly/platform.h" namespace poly { diff --git a/src/poly/atomic.h b/src/poly/atomic.h index 6c11a4172..ee6e19a50 100644 --- a/src/poly/atomic.h +++ b/src/poly/atomic.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "poly/config.h" +#include "poly/platform.h" #if XE_LIKE_OSX #include diff --git a/src/poly/byte_order.h b/src/poly/byte_order.h index 8cb478a92..44eb13e9c 100644 --- a/src/poly/byte_order.h +++ b/src/poly/byte_order.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "poly/config.h" +#include "poly/platform.h" #if XE_LIKE_OSX #include diff --git a/src/poly/cxx_compat.h b/src/poly/cxx_compat.h index 632be698e..74551bbe3 100644 --- a/src/poly/cxx_compat.h +++ b/src/poly/cxx_compat.h @@ -12,7 +12,7 @@ #include -#include +#include "poly/config.h" // C++11 thread local storage. // http://en.cppreference.com/w/cpp/language/storage_duration diff --git a/src/poly/debugging.h b/src/poly/debugging.h index a9c60ff25..543c38f56 100644 --- a/src/poly/debugging.h +++ b/src/poly/debugging.h @@ -12,7 +12,7 @@ #include -#include +#include "poly/config.h" namespace poly { namespace debugging { diff --git a/src/poly/debugging_win.cc b/src/poly/debugging_win.cc index 05916f700..e7218fe91 100644 --- a/src/poly/debugging_win.cc +++ b/src/poly/debugging_win.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "poly/debugging.h" #include diff --git a/src/poly/logging.cc b/src/poly/logging.cc index 903537376..1df990281 100644 --- a/src/poly/logging.cc +++ b/src/poly/logging.cc @@ -7,14 +7,14 @@ ****************************************************************************** */ -#include +#include "poly/logging.h" #include #include -#include -#include -#include +#include "poly/cxx_compat.h" +#include "poly/main.h" +#include "poly/math.h" DEFINE_bool(fast_stdout, false, "Don't lock around stdout/stderr. May introduce weirdness."); diff --git a/src/poly/logging.h b/src/poly/logging.h index 6ac8e0b75..49f13d434 100644 --- a/src/poly/logging.h +++ b/src/poly/logging.h @@ -12,7 +12,7 @@ #include -#include +#include "poly/string.h" namespace poly { diff --git a/src/poly/main.h b/src/poly/main.h index 82c02576d..497c21bae 100644 --- a/src/poly/main.h +++ b/src/poly/main.h @@ -13,7 +13,7 @@ #include #include -#include +#include "poly/platform.h" namespace poly { diff --git a/src/poly/main_win.cc b/src/poly/main_win.cc index 122fa5327..0b95a0350 100644 --- a/src/poly/main_win.cc +++ b/src/poly/main_win.cc @@ -7,14 +7,14 @@ ****************************************************************************** */ -#include +#include "poly/main.h" #include #include #include #include -#include +#include "poly/string.h" namespace poly { diff --git a/src/poly/mapped_memory_win.cc b/src/poly/mapped_memory_win.cc index e40f2144d..98162567c 100644 --- a/src/poly/mapped_memory_win.cc +++ b/src/poly/mapped_memory_win.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "poly/mapped_memory.h" #include diff --git a/src/poly/math.cc b/src/poly/math.cc index af7c661f7..6ed8c7329 100644 --- a/src/poly/math.cc +++ b/src/poly/math.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "poly/math.h" namespace poly { diff --git a/src/poly/math.h b/src/poly/math.h index 49edd2dc0..369bc9b05 100644 --- a/src/poly/math.h +++ b/src/poly/math.h @@ -17,8 +17,8 @@ #include #include -#include -#include +#include "poly/config.h" +#include "poly/platform.h" namespace poly { diff --git a/src/poly/memory.cc b/src/poly/memory.cc index 0f6e47f1c..585e38a82 100644 --- a/src/poly/memory.cc +++ b/src/poly/memory.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "poly/memory.h" #include diff --git a/src/poly/memory.h b/src/poly/memory.h index c4e5b4b90..8214b6c5c 100644 --- a/src/poly/memory.h +++ b/src/poly/memory.h @@ -13,8 +13,8 @@ #include #include -#include -#include +#include "poly/assert.h" +#include "poly/byte_order.h" namespace poly { diff --git a/src/poly/poly.h b/src/poly/poly.h index db4a1796c..c379d6697 100644 --- a/src/poly/poly.h +++ b/src/poly/poly.h @@ -10,19 +10,19 @@ #ifndef POLY_POLY_H_ #define POLY_POLY_H_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "poly/assert.h" +#include "poly/atomic.h" +#include "poly/byte_order.h" +#include "poly/config.h" +#include "poly/cxx_compat.h" +#include "poly/debugging.h" +#include "poly/logging.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" namespace poly {} // namespace poly diff --git a/src/poly/string.cc b/src/poly/string.cc index f2a822ce0..e3100f872 100644 --- a/src/poly/string.cc +++ b/src/poly/string.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "poly/string.h" #include #include diff --git a/src/poly/string.h b/src/poly/string.h index 0787ba935..8db5f9297 100644 --- a/src/poly/string.h +++ b/src/poly/string.h @@ -14,7 +14,7 @@ #include #include -#include +#include "poly/platform.h" #if XE_LIKE_WIN32 #define strcasecmp _stricmp diff --git a/src/poly/threading.cc b/src/poly/threading.cc index f879097d3..5550647d2 100644 --- a/src/poly/threading.cc +++ b/src/poly/threading.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "poly/threading.h" namespace poly { namespace threading { diff --git a/src/poly/threading.h b/src/poly/threading.h index a82eb6138..2d103c07a 100644 --- a/src/poly/threading.h +++ b/src/poly/threading.h @@ -18,7 +18,7 @@ #include #include -#include +#include "poly/config.h" namespace poly { namespace threading { diff --git a/src/poly/threading_win.cc b/src/poly/threading_win.cc index 949f68749..8af078aff 100644 --- a/src/poly/threading_win.cc +++ b/src/poly/threading_win.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "poly/threading.h" -#include +#include "poly/platform.h" namespace poly { namespace threading { diff --git a/src/poly/ui/control.cc b/src/poly/ui/control.cc index 0d2fca91b..e7a55901b 100644 --- a/src/poly/ui/control.cc +++ b/src/poly/ui/control.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "poly/ui/control.h" -#include +#include "poly/assert.h" namespace poly { namespace ui { diff --git a/src/poly/ui/control.h b/src/poly/ui/control.h index d96cf4629..0abc72ab2 100644 --- a/src/poly/ui/control.h +++ b/src/poly/ui/control.h @@ -13,8 +13,8 @@ #include #include -#include -#include +#include "poly/delegate.h" +#include "poly/ui/ui_event.h" namespace poly { namespace ui { diff --git a/src/poly/ui/menu_item.cc b/src/poly/ui/menu_item.cc index c75ab80ad..623251f98 100644 --- a/src/poly/ui/menu_item.cc +++ b/src/poly/ui/menu_item.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "poly/ui/menu_item.h" namespace poly { namespace ui { diff --git a/src/poly/ui/menu_item.h b/src/poly/ui/menu_item.h index cdd285b55..1da156e42 100644 --- a/src/poly/ui/menu_item.h +++ b/src/poly/ui/menu_item.h @@ -13,8 +13,8 @@ #include #include -#include -#include +#include "poly/delegate.h" +#include "poly/ui/ui_event.h" namespace poly { namespace ui { diff --git a/src/poly/ui/win32/win32_control.cc b/src/poly/ui/win32/win32_control.cc index d26716a2d..5d02a9d97 100644 --- a/src/poly/ui/win32/win32_control.cc +++ b/src/poly/ui/win32/win32_control.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "poly/ui/win32/win32_control.h" namespace poly { namespace ui { diff --git a/src/poly/ui/win32/win32_control.h b/src/poly/ui/win32/win32_control.h index baef5ae4f..f46de9afe 100644 --- a/src/poly/ui/win32/win32_control.h +++ b/src/poly/ui/win32/win32_control.h @@ -13,7 +13,7 @@ #include #include -#include +#include "poly/ui/control.h" namespace poly { namespace ui { diff --git a/src/poly/ui/win32/win32_loop.cc b/src/poly/ui/win32/win32_loop.cc index dad966528..ca409d5cf 100644 --- a/src/poly/ui/win32/win32_loop.cc +++ b/src/poly/ui/win32/win32_loop.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "poly/ui/win32/win32_loop.h" -#include +#include "poly/assert.h" namespace poly { namespace ui { diff --git a/src/poly/ui/win32/win32_loop.h b/src/poly/ui/win32/win32_loop.h index 629c2ee44..aa953d57e 100644 --- a/src/poly/ui/win32/win32_loop.h +++ b/src/poly/ui/win32/win32_loop.h @@ -18,8 +18,8 @@ #include #include -#include -#include +#include "poly/threading.h" +#include "poly/ui/loop.h" namespace poly { namespace ui { diff --git a/src/poly/ui/win32/win32_menu_item.cc b/src/poly/ui/win32/win32_menu_item.cc index 4824f989b..c0bc37ec0 100644 --- a/src/poly/ui/win32/win32_menu_item.cc +++ b/src/poly/ui/win32/win32_menu_item.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "poly/ui/win32/win32_menu_item.h" namespace poly { namespace ui { diff --git a/src/poly/ui/win32/win32_menu_item.h b/src/poly/ui/win32/win32_menu_item.h index 80f9a7150..b155bacce 100644 --- a/src/poly/ui/win32/win32_menu_item.h +++ b/src/poly/ui/win32/win32_menu_item.h @@ -13,7 +13,7 @@ #include #include -#include +#include "poly/ui/menu_item.h" namespace poly { namespace ui { diff --git a/src/poly/ui/win32/win32_window.cc b/src/poly/ui/win32/win32_window.cc index 62cf67371..3f3a33e82 100644 --- a/src/poly/ui/win32/win32_window.cc +++ b/src/poly/ui/win32/win32_window.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include +#include "poly/ui/win32/win32_window.h" #include #include #include -#include +#include "poly/logging.h" namespace poly { namespace ui { diff --git a/src/poly/ui/win32/win32_window.h b/src/poly/ui/win32/win32_window.h index 1f3b030f5..5d172afca 100644 --- a/src/poly/ui/win32/win32_window.h +++ b/src/poly/ui/win32/win32_window.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "poly/ui/win32/win32_control.h" +#include "poly/ui/window.h" namespace poly { namespace ui { diff --git a/src/poly/ui/window.h b/src/poly/ui/window.h index a4e584372..62302f548 100644 --- a/src/poly/ui/window.h +++ b/src/poly/ui/window.h @@ -12,9 +12,9 @@ #include -#include -#include -#include +#include "poly/delegate.h" +#include "poly/ui/control.h" +#include "poly/ui/ui_event.h" namespace poly { namespace ui { diff --git a/src/xenia/apu/apu.cc b/src/xenia/apu/apu.cc index e7ed8c292..6a0df3a5f 100644 --- a/src/xenia/apu/apu.cc +++ b/src/xenia/apu/apu.cc @@ -7,21 +7,21 @@ ****************************************************************************** */ -#include -#include +#include "xenia/apu/apu.h" +#include "xenia/apu/apu-private.h" using namespace xe; using namespace xe::apu; DEFINE_string(apu, "any", "Audio system. Use: [any, nop, xaudio2]"); -#include +#include "xenia/apu/nop/nop_apu.h" std::unique_ptr xe::apu::CreateNop(Emulator* emulator) { return xe::apu::nop::Create(emulator); } #if XE_PLATFORM_WIN32 -#include +#include "xenia/apu/xaudio2/xaudio2_apu.h" std::unique_ptr xe::apu::CreateXAudio2(Emulator* emulator) { return xe::apu::xaudio2::Create(emulator); } diff --git a/src/xenia/apu/apu.h b/src/xenia/apu/apu.h index 2a5178a3a..c9f2931b3 100644 --- a/src/xenia/apu/apu.h +++ b/src/xenia/apu/apu.h @@ -12,7 +12,7 @@ #include -#include +#include "xenia/apu/audio_system.h" namespace xe { class Emulator; diff --git a/src/xenia/apu/audio_driver.cc b/src/xenia/apu/audio_driver.cc index e3bb88756..b896f4373 100644 --- a/src/xenia/apu/audio_driver.cc +++ b/src/xenia/apu/audio_driver.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "xenia/apu/audio_driver.h" -#include -#include -#include +#include "xenia/emulator.h" +#include "xenia/cpu/processor.h" +#include "xenia/cpu/xenon_thread_state.h" using namespace xe; diff --git a/src/xenia/apu/audio_driver.h b/src/xenia/apu/audio_driver.h index d100f6e8f..f2119801e 100644 --- a/src/xenia/apu/audio_driver.h +++ b/src/xenia/apu/audio_driver.h @@ -10,9 +10,9 @@ #ifndef XENIA_APU_AUDIO_DRIVER_H_ #define XENIA_APU_AUDIO_DRIVER_H_ -#include -#include -#include +#include "xenia/common.h" +#include "xenia/emulator.h" +#include "xenia/xbox.h" namespace xe { namespace apu { diff --git a/src/xenia/apu/audio_system.cc b/src/xenia/apu/audio_system.cc index f6e6c9ecf..7c646d58d 100644 --- a/src/xenia/apu/audio_system.cc +++ b/src/xenia/apu/audio_system.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include -#include +#include "xenia/apu/audio_system.h" +#include "xenia/apu/audio_driver.h" -#include -#include -#include -#include +#include "poly/poly.h" +#include "xenia/emulator.h" +#include "xenia/cpu/processor.h" +#include "xenia/cpu/xenon_thread_state.h" using namespace xe; using namespace xe::apu; diff --git a/src/xenia/apu/audio_system.h b/src/xenia/apu/audio_system.h index 20a24e136..3dd3c1ad2 100644 --- a/src/xenia/apu/audio_system.h +++ b/src/xenia/apu/audio_system.h @@ -15,9 +15,9 @@ #include #include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/emulator.h" +#include "xenia/xbox.h" namespace xe { namespace apu { diff --git a/src/xenia/apu/nop/nop_apu-private.h b/src/xenia/apu/nop/nop_apu-private.h index f41803693..5f3b08dfc 100644 --- a/src/xenia/apu/nop/nop_apu-private.h +++ b/src/xenia/apu/nop/nop_apu-private.h @@ -10,9 +10,9 @@ #ifndef XENIA_APU_NOP_NOP_APU_PRIVATE_H_ #define XENIA_APU_NOP_NOP_APU_PRIVATE_H_ -#include +#include "xenia/common.h" -#include +#include "xenia/apu/nop/nop_apu.h" namespace xe { diff --git a/src/xenia/apu/nop/nop_apu.cc b/src/xenia/apu/nop/nop_apu.cc index 1ab673338..74fd3ce9c 100644 --- a/src/xenia/apu/nop/nop_apu.cc +++ b/src/xenia/apu/nop/nop_apu.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/apu/nop/nop_apu.h" -#include +#include "xenia/apu/nop/nop_audio_system.h" using namespace xe; using namespace xe::apu; diff --git a/src/xenia/apu/nop/nop_apu.h b/src/xenia/apu/nop/nop_apu.h index 9159c7b60..9827551ae 100644 --- a/src/xenia/apu/nop/nop_apu.h +++ b/src/xenia/apu/nop/nop_apu.h @@ -12,7 +12,7 @@ #include -#include +#include "xenia/common.h" namespace xe { class Emulator; diff --git a/src/xenia/apu/nop/nop_audio_system.cc b/src/xenia/apu/nop/nop_audio_system.cc index d384c3de3..8901d9e96 100644 --- a/src/xenia/apu/nop/nop_audio_system.cc +++ b/src/xenia/apu/nop/nop_audio_system.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/apu/nop/nop_audio_system.h" -#include +#include "xenia/apu/apu-private.h" using namespace xe; diff --git a/src/xenia/apu/nop/nop_audio_system.h b/src/xenia/apu/nop/nop_audio_system.h index c42982572..e806ebe49 100644 --- a/src/xenia/apu/nop/nop_audio_system.h +++ b/src/xenia/apu/nop/nop_audio_system.h @@ -10,10 +10,10 @@ #ifndef XENIA_APU_NOP_NOP_AUDIO_SYSTEM_H_ #define XENIA_APU_NOP_NOP_AUDIO_SYSTEM_H_ -#include +#include "xenia/common.h" -#include -#include +#include "xenia/apu/audio_system.h" +#include "xenia/apu/nop/nop_apu-private.h" namespace xe { diff --git a/src/xenia/apu/xaudio2/xaudio2_apu-private.h b/src/xenia/apu/xaudio2/xaudio2_apu-private.h index 4c890b5e7..37190bba6 100644 --- a/src/xenia/apu/xaudio2/xaudio2_apu-private.h +++ b/src/xenia/apu/xaudio2/xaudio2_apu-private.h @@ -10,9 +10,9 @@ #ifndef XENIA_APU_XAUDIO2_XAUDIO2_APU_PRIVATE_H_ #define XENIA_APU_XAUDIO2_XAUDIO2_APU_PRIVATE_H_ -#include +#include "xenia/common.h" -#include +#include "xenia/apu/xaudio2/xaudio2_apu.h" namespace xe { diff --git a/src/xenia/apu/xaudio2/xaudio2_apu.cc b/src/xenia/apu/xaudio2/xaudio2_apu.cc index 2c02ccb5f..e3d6857e1 100644 --- a/src/xenia/apu/xaudio2/xaudio2_apu.cc +++ b/src/xenia/apu/xaudio2/xaudio2_apu.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/apu/xaudio2/xaudio2_apu.h" -#include +#include "xenia/apu/xaudio2/xaudio2_audio_system.h" using namespace xe; using namespace xe::apu; diff --git a/src/xenia/apu/xaudio2/xaudio2_apu.h b/src/xenia/apu/xaudio2/xaudio2_apu.h index 5cdd5245c..e9fbabda9 100644 --- a/src/xenia/apu/xaudio2/xaudio2_apu.h +++ b/src/xenia/apu/xaudio2/xaudio2_apu.h @@ -12,7 +12,7 @@ #include -#include +#include "xenia/common.h" namespace xe { class Emulator; diff --git a/src/xenia/apu/xaudio2/xaudio2_audio_driver.cc b/src/xenia/apu/xaudio2/xaudio2_audio_driver.cc index e3dbdd534..8515790e2 100644 --- a/src/xenia/apu/xaudio2/xaudio2_audio_driver.cc +++ b/src/xenia/apu/xaudio2/xaudio2_audio_driver.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "xenia/apu/xaudio2/xaudio2_audio_driver.h" -#include +#include "xenia/apu/apu-private.h" -#include +#include "xenia/emulator.h" using namespace xe; using namespace xe::apu; diff --git a/src/xenia/apu/xaudio2/xaudio2_audio_driver.h b/src/xenia/apu/xaudio2/xaudio2_audio_driver.h index 6a500f806..242e3974d 100644 --- a/src/xenia/apu/xaudio2/xaudio2_audio_driver.h +++ b/src/xenia/apu/xaudio2/xaudio2_audio_driver.h @@ -12,9 +12,9 @@ #include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/apu/audio_driver.h" +#include "xenia/apu/xaudio2/xaudio2_apu-private.h" namespace xe { namespace apu { diff --git a/src/xenia/apu/xaudio2/xaudio2_audio_system.cc b/src/xenia/apu/xaudio2/xaudio2_audio_system.cc index f87197cb4..4fee2d3b0 100644 --- a/src/xenia/apu/xaudio2/xaudio2_audio_system.cc +++ b/src/xenia/apu/xaudio2/xaudio2_audio_system.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include -#include +#include "xenia/apu/xaudio2/xaudio2_audio_system.h" +#include "xenia/apu/xaudio2/xaudio2_audio_driver.h" -#include +#include "xenia/apu/apu-private.h" -#include +#include "xenia/emulator.h" using namespace xe; using namespace xe::apu; diff --git a/src/xenia/apu/xaudio2/xaudio2_audio_system.h b/src/xenia/apu/xaudio2/xaudio2_audio_system.h index 82f01bce3..8cbc87d1f 100644 --- a/src/xenia/apu/xaudio2/xaudio2_audio_system.h +++ b/src/xenia/apu/xaudio2/xaudio2_audio_system.h @@ -12,9 +12,9 @@ #include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/apu/audio_system.h" +#include "xenia/apu/xaudio2/xaudio2_apu-private.h" namespace xe { namespace apu { diff --git a/src/xenia/common.h b/src/xenia/common.h index f20beaa90..9a19845e1 100644 --- a/src/xenia/common.h +++ b/src/xenia/common.h @@ -10,13 +10,13 @@ #ifndef XENIA_COMMON_H_ #define XENIA_COMMON_H_ -#include -#include -#include -#include -#include +#include "poly/assert.h" +#include "poly/atomic.h" +#include "poly/byte_order.h" +#include "poly/memory.h" +#include "poly/string.h" -#include -#include +#include "xenia/logging.h" +#include "xenia/profiling.h" #endif // XENIA_COMMON_H_ diff --git a/src/xenia/cpu/cpu.cc b/src/xenia/cpu/cpu.cc index 61ed9ac61..dbc6cc34b 100644 --- a/src/xenia/cpu/cpu.cc +++ b/src/xenia/cpu/cpu.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "xenia/cpu/cpu-private.h" // Debugging: DEFINE_bool(trace_function_generation, false, diff --git a/src/xenia/cpu/cpu.h b/src/xenia/cpu/cpu.h index c5253ff64..15a3d4a53 100644 --- a/src/xenia/cpu/cpu.h +++ b/src/xenia/cpu/cpu.h @@ -10,9 +10,9 @@ #ifndef XENIA_CPU_CPU_H_ #define XENIA_CPU_CPU_H_ -#include -#include -#include -#include +#include "xenia/cpu/processor.h" +#include "xenia/cpu/xenon_runtime.h" +#include "xenia/cpu/xenon_thread_state.h" +#include "xenia/cpu/xex_module.h" #endif // XENIA_CPU_CPU_H_ diff --git a/src/xenia/cpu/mmio_handler.cc b/src/xenia/cpu/mmio_handler.cc index eb6834b38..f09880030 100644 --- a/src/xenia/cpu/mmio_handler.cc +++ b/src/xenia/cpu/mmio_handler.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/cpu/mmio_handler.h" -#include +#include "poly/poly.h" namespace BE { #include diff --git a/src/xenia/cpu/mmio_handler_win.cc b/src/xenia/cpu/mmio_handler_win.cc index e645c0a64..2711ed167 100644 --- a/src/xenia/cpu/mmio_handler_win.cc +++ b/src/xenia/cpu/mmio_handler_win.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "xenia/cpu/mmio_handler.h" #include diff --git a/src/xenia/cpu/processor.cc b/src/xenia/cpu/processor.cc index a0a3c60f5..2777297d0 100644 --- a/src/xenia/cpu/processor.cc +++ b/src/xenia/cpu/processor.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "xenia/cpu/processor.h" -#include -#include -#include -#include +#include "xenia/export_resolver.h" +#include "xenia/cpu/cpu-private.h" +#include "xenia/cpu/xenon_runtime.h" +#include "xenia/cpu/xex_module.h" using namespace alloy; using namespace alloy::backend; diff --git a/src/xenia/cpu/processor.h b/src/xenia/cpu/processor.h index 5bab11ab4..84d76c1c0 100644 --- a/src/xenia/cpu/processor.h +++ b/src/xenia/cpu/processor.h @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/export_resolver.h" +#include "xenia/memory.h" namespace xe { namespace cpu { diff --git a/src/xenia/cpu/xenon_runtime.cc b/src/xenia/cpu/xenon_runtime.cc index 61ca8aabe..2b9ffb306 100644 --- a/src/xenia/cpu/xenon_runtime.cc +++ b/src/xenia/cpu/xenon_runtime.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "xenia/cpu/xenon_runtime.h" -#include -#include +#include "alloy/frontend/ppc/ppc_frontend.h" +#include "xenia/cpu/xenon_thread_state.h" using namespace xe; using namespace xe::cpu; diff --git a/src/xenia/cpu/xenon_runtime.h b/src/xenia/cpu/xenon_runtime.h index deb37d8c2..3aae4f0e2 100644 --- a/src/xenia/cpu/xenon_runtime.h +++ b/src/xenia/cpu/xenon_runtime.h @@ -10,11 +10,11 @@ #ifndef XENIA_CPU_XENON_RUNTIME_H_ #define XENIA_CPU_XENON_RUNTIME_H_ -#include -#include -#include -#include -#include +#include "alloy/runtime/runtime.h" +#include "xenia/common.h" +#include "xenia/cpu/xenon_thread_state.h" +#include "xenia/export_resolver.h" +#include "xenia/memory.h" namespace xe { namespace cpu { diff --git a/src/xenia/cpu/xenon_thread_state.cc b/src/xenia/cpu/xenon_thread_state.cc index 2c8109f96..ce3083cae 100644 --- a/src/xenia/cpu/xenon_thread_state.cc +++ b/src/xenia/cpu/xenon_thread_state.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "xenia/cpu/xenon_thread_state.h" -#include -#include +#include "xdb/protocol.h" +#include "xenia/cpu/xenon_runtime.h" using namespace alloy; using namespace alloy::frontend; diff --git a/src/xenia/cpu/xenon_thread_state.h b/src/xenia/cpu/xenon_thread_state.h index 7a73bfccf..926ea04d1 100644 --- a/src/xenia/cpu/xenon_thread_state.h +++ b/src/xenia/cpu/xenon_thread_state.h @@ -10,10 +10,10 @@ #ifndef XENIA_CPU_XENON_THREAD_STATE_H_ #define XENIA_CPU_XENON_THREAD_STATE_H_ -#include -#include -#include -#include +#include "alloy/frontend/ppc/ppc_context.h" +#include "alloy/runtime/thread_state.h" +#include "xenia/common.h" +#include "xenia/memory.h" namespace xdb { namespace protocol { diff --git a/src/xenia/cpu/xex_module.cc b/src/xenia/cpu/xex_module.cc index 604e130e7..1f4940573 100644 --- a/src/xenia/cpu/xex_module.cc +++ b/src/xenia/cpu/xex_module.cc @@ -7,14 +7,14 @@ ****************************************************************************** */ -#include +#include "xenia/cpu/xex_module.h" #include -#include -#include -#include -#include +#include "poly/math.h" +#include "xenia/cpu/cpu-private.h" +#include "xenia/cpu/xenon_runtime.h" +#include "xenia/export_resolver.h" using namespace alloy; using namespace alloy::runtime; diff --git a/src/xenia/cpu/xex_module.h b/src/xenia/cpu/xex_module.h index 52a6cf9d3..222b25841 100644 --- a/src/xenia/cpu/xex_module.h +++ b/src/xenia/cpu/xex_module.h @@ -12,9 +12,9 @@ #include -#include -#include -#include +#include "alloy/runtime/module.h" +#include "xenia/common.h" +#include "xenia/kernel/util/xex2.h" namespace xe { namespace cpu { diff --git a/src/xenia/debug_agent.cc b/src/xenia/debug_agent.cc index 4c552a31a..e1df194de 100644 --- a/src/xenia/debug_agent.cc +++ b/src/xenia/debug_agent.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/debug_agent.h" -#include +#include "poly/string.h" #include DEFINE_string(trace_file, "", "Trace to the given file."); diff --git a/src/xenia/debug_agent.h b/src/xenia/debug_agent.h index 57577dced..6fd1f9d8d 100644 --- a/src/xenia/debug_agent.h +++ b/src/xenia/debug_agent.h @@ -12,7 +12,7 @@ #include -#include +#include "xenia/common.h" namespace xe { diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc index 048e5f9cb..df4960e39 100644 --- a/src/xenia/emulator.cc +++ b/src/xenia/emulator.cc @@ -7,20 +7,20 @@ ****************************************************************************** */ -#include +#include "xenia/emulator.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "poly/poly.h" +#include "xdb/protocol.h" +#include "xenia/apu/apu.h" +#include "xenia/cpu/cpu.h" +#include "xenia/gpu/gpu.h" +#include "xenia/hid/hid.h" +#include "xenia/kernel/kernel.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/modules.h" +#include "xenia/kernel/fs/filesystem.h" +#include "xenia/memory.h" +#include "xenia/ui/main_window.h" namespace xe { diff --git a/src/xenia/emulator.h b/src/xenia/emulator.h index ecb09ff44..5a70e1efc 100644 --- a/src/xenia/emulator.h +++ b/src/xenia/emulator.h @@ -12,12 +12,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/debug_agent.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/memory.h" +#include "xenia/ui/main_window.h" +#include "xenia/xbox.h" namespace xe { namespace apu { diff --git a/src/xenia/export_resolver.cc b/src/xenia/export_resolver.cc index 9de2a9515..91b982c78 100644 --- a/src/xenia/export_resolver.cc +++ b/src/xenia/export_resolver.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/export_resolver.h" -#include +#include "poly/math.h" namespace xe { diff --git a/src/xenia/export_resolver.h b/src/xenia/export_resolver.h index c8ceea761..149ad3e76 100644 --- a/src/xenia/export_resolver.h +++ b/src/xenia/export_resolver.h @@ -10,7 +10,7 @@ #ifndef XENIA_EXPORT_RESOLVER_H_ #define XENIA_EXPORT_RESOLVER_H_ -#include +#include "xenia/common.h" #include #include diff --git a/src/xenia/gpu/gl4/circular_buffer.cc b/src/xenia/gpu/gl4/circular_buffer.cc index a2554f9fb..bfd7cbf2d 100644 --- a/src/xenia/gpu/gl4/circular_buffer.cc +++ b/src/xenia/gpu/gl4/circular_buffer.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/gl4/circular_buffer.h" -#include -#include -#include -#include +#include "poly/assert.h" +#include "poly/math.h" +#include "xenia/gpu/gl4/gl4_gpu-private.h" +#include "xenia/gpu/gpu-private.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/circular_buffer.h b/src/xenia/gpu/gl4/circular_buffer.h index aaa7ea7e8..7a0232693 100644 --- a/src/xenia/gpu/gl4/circular_buffer.h +++ b/src/xenia/gpu/gl4/circular_buffer.h @@ -10,7 +10,7 @@ #ifndef XENIA_GPU_GL4_CIRCULAR_BUFFER_H_ #define XENIA_GPU_GL4_CIRCULAR_BUFFER_H_ -#include +#include "xenia/gpu/gl4/gl_context.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/command_processor.cc b/src/xenia/gpu/gl4/command_processor.cc index 203c6a000..b9676cd1d 100644 --- a/src/xenia/gpu/gl4/command_processor.cc +++ b/src/xenia/gpu/gl4/command_processor.cc @@ -7,20 +7,20 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/gl4/command_processor.h" #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "poly/logging.h" +#include "poly/math.h" +#include "xenia/gpu/gl4/gl4_gpu-private.h" +#include "xenia/gpu/gl4/gl4_graphics_system.h" +#include "xenia/gpu/gpu-private.h" +#include "xenia/gpu/sampler_info.h" +#include "xenia/gpu/texture_info.h" +#include "xenia/gpu/xenos.h" -#include +#include "third_party/xxhash/xxhash.h" #define XETRACECP(fmt, ...) \ if (FLAGS_trace_ring_buffer) XELOGGPU(fmt, ##__VA_ARGS__) diff --git a/src/xenia/gpu/gl4/command_processor.h b/src/xenia/gpu/gl4/command_processor.h index 6a21459dd..769b581a3 100644 --- a/src/xenia/gpu/gl4/command_processor.h +++ b/src/xenia/gpu/gl4/command_processor.h @@ -17,14 +17,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "xenia/gpu/gl4/circular_buffer.h" +#include "xenia/gpu/gl4/draw_batcher.h" +#include "xenia/gpu/gl4/gl_context.h" +#include "xenia/gpu/gl4/gl4_shader.h" +#include "xenia/gpu/gl4/texture_cache.h" +#include "xenia/gpu/register_file.h" +#include "xenia/gpu/xenos.h" +#include "xenia/memory.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/draw_batcher.cc b/src/xenia/gpu/gl4/draw_batcher.cc index 304992a80..cc78afe2f 100644 --- a/src/xenia/gpu/gl4/draw_batcher.cc +++ b/src/xenia/gpu/gl4/draw_batcher.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/gl4/draw_batcher.h" -#include -#include -#include -#include +#include "poly/cxx_compat.h" +#include "poly/math.h" +#include "xenia/gpu/gl4/gl4_gpu-private.h" +#include "xenia/gpu/gpu-private.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/draw_batcher.h b/src/xenia/gpu/gl4/draw_batcher.h index f930ba2a0..b1c52dbf5 100644 --- a/src/xenia/gpu/gl4/draw_batcher.h +++ b/src/xenia/gpu/gl4/draw_batcher.h @@ -10,12 +10,12 @@ #ifndef XENIA_GPU_GL4_GL4_STATE_DATA_BUILDER_H_ #define XENIA_GPU_GL4_GL4_STATE_DATA_BUILDER_H_ -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/gpu/gl4/circular_buffer.h" +#include "xenia/gpu/gl4/gl_context.h" +#include "xenia/gpu/gl4/gl4_shader.h" +#include "xenia/gpu/register_file.h" +#include "xenia/gpu/xenos.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl4_gpu-private.h b/src/xenia/gpu/gl4/gl4_gpu-private.h index 73937bee4..3d14b5823 100644 --- a/src/xenia/gpu/gl4/gl4_gpu-private.h +++ b/src/xenia/gpu/gl4/gl4_gpu-private.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "xenia/common.h" +#include "xenia/gpu/gl4/gl4_gpu.h" DECLARE_bool(thread_safe_gl); diff --git a/src/xenia/gpu/gl4/gl4_gpu.cc b/src/xenia/gpu/gl4/gl4_gpu.cc index 3f9ef960d..be29dc6a5 100644 --- a/src/xenia/gpu/gl4/gl4_gpu.cc +++ b/src/xenia/gpu/gl4/gl4_gpu.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/gl4/gl4_gpu.h" -#include -#include +#include "xenia/gpu/gl4/gl4_gpu-private.h" +#include "xenia/gpu/gl4/gl4_graphics_system.h" DEFINE_bool(thread_safe_gl, false, "Only allow one GL context to be active at a time."); diff --git a/src/xenia/gpu/gl4/gl4_gpu.h b/src/xenia/gpu/gl4/gl4_gpu.h index 65c3dfaa6..c6144cec4 100644 --- a/src/xenia/gpu/gl4/gl4_gpu.h +++ b/src/xenia/gpu/gl4/gl4_gpu.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "xenia/common.h" +#include "xenia/gpu/graphics_system.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl4_graphics_system.cc b/src/xenia/gpu/gl4/gl4_graphics_system.cc index a92339bd6..24bd0527a 100644 --- a/src/xenia/gpu/gl4/gl4_graphics_system.cc +++ b/src/xenia/gpu/gl4/gl4_graphics_system.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/gl4/gl4_graphics_system.h" -#include -#include -#include -#include -#include +#include "poly/threading.h" +#include "xenia/cpu/processor.h" +#include "xenia/gpu/gl4/gl4_gpu-private.h" +#include "xenia/gpu/gl4/gl4_profiler_display.h" +#include "xenia/gpu/gpu-private.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl4_graphics_system.h b/src/xenia/gpu/gl4/gl4_graphics_system.h index 17e33f84c..6a6d028d8 100644 --- a/src/xenia/gpu/gl4/gl4_graphics_system.h +++ b/src/xenia/gpu/gl4/gl4_graphics_system.h @@ -12,11 +12,11 @@ #include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/gpu/gl4/command_processor.h" +#include "xenia/gpu/gl4/wgl_control.h" +#include "xenia/gpu/graphics_system.h" +#include "xenia/gpu/register_file.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl4_profiler_display.cc b/src/xenia/gpu/gl4/gl4_profiler_display.cc index f60723cce..cd31a7ad1 100644 --- a/src/xenia/gpu/gl4/gl4_profiler_display.cc +++ b/src/xenia/gpu/gl4/gl4_profiler_display.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/gl4/gl4_profiler_display.h" -#include +#include "third_party/microprofile/microprofileui.h" -#include -#include -#include +#include "poly/cxx_compat.h" +#include "poly/math.h" +#include "xenia/gpu/gpu-private.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl4_profiler_display.h b/src/xenia/gpu/gl4/gl4_profiler_display.h index d5290d62f..c7d7ea338 100644 --- a/src/xenia/gpu/gl4/gl4_profiler_display.h +++ b/src/xenia/gpu/gl4/gl4_profiler_display.h @@ -10,11 +10,11 @@ #ifndef XENIA_GPU_GL4_GL4_PROFILER_DISPLAY_H_ #define XENIA_GPU_GL4_GL4_PROFILER_DISPLAY_H_ -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/gpu/gl4/circular_buffer.h" +#include "xenia/gpu/gl4/gl_context.h" +#include "xenia/gpu/gl4/wgl_control.h" +#include "xenia/profiling.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl4_shader.cc b/src/xenia/gpu/gl4/gl4_shader.cc index 2255be226..3f5aba911 100644 --- a/src/xenia/gpu/gl4/gl4_shader.cc +++ b/src/xenia/gpu/gl4/gl4_shader.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/gl4/gl4_shader.h" -#include -#include -#include -#include -#include +#include "poly/cxx_compat.h" +#include "poly/math.h" +#include "xenia/gpu/gl4/gl4_gpu-private.h" +#include "xenia/gpu/gl4/gl4_shader_translator.h" +#include "xenia/gpu/gpu-private.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl4_shader.h b/src/xenia/gpu/gl4/gl4_shader.h index 1dac6b4c3..5c9b4eb24 100644 --- a/src/xenia/gpu/gl4/gl4_shader.h +++ b/src/xenia/gpu/gl4/gl4_shader.h @@ -12,9 +12,9 @@ #include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/gpu/gl4/gl_context.h" +#include "xenia/gpu/shader.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl4_shader_translator.cc b/src/xenia/gpu/gl4/gl4_shader_translator.cc index 1b3aff02b..28b49f31e 100644 --- a/src/xenia/gpu/gl4/gl4_shader_translator.cc +++ b/src/xenia/gpu/gl4/gl4_shader_translator.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/gl4/gl4_shader_translator.h" -#include -#include +#include "poly/math.h" +#include "xenia/gpu/gpu-private.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl4_shader_translator.h b/src/xenia/gpu/gl4/gl4_shader_translator.h index d0453c38b..44939a8a0 100644 --- a/src/xenia/gpu/gl4/gl4_shader_translator.h +++ b/src/xenia/gpu/gl4/gl4_shader_translator.h @@ -12,12 +12,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "alloy/string_buffer.h" +#include "xenia/common.h" +#include "xenia/gpu/gl4/gl_context.h" +#include "xenia/gpu/gl4/gl4_shader.h" +#include "xenia/gpu/ucode.h" +#include "xenia/gpu/xenos.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl_context.cc b/src/xenia/gpu/gl4/gl_context.cc index 3d4600514..c16e15e2f 100644 --- a/src/xenia/gpu/gl4/gl_context.cc +++ b/src/xenia/gpu/gl4/gl_context.cc @@ -7,15 +7,15 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/gl4/gl_context.h" #include -#include -#include -#include -#include -#include +#include "poly/assert.h" +#include "poly/cxx_compat.h" +#include "poly/logging.h" +#include "poly/math.h" +#include "xenia/gpu/gl4/gl4_gpu-private.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/gl_context.h b/src/xenia/gpu/gl4/gl_context.h index 196c99a15..9ac386f53 100644 --- a/src/xenia/gpu/gl4/gl_context.h +++ b/src/xenia/gpu/gl4/gl_context.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "third_party/GL/glew.h" +#include "third_party/GL/wglew.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/texture_cache.cc b/src/xenia/gpu/gl4/texture_cache.cc index 6193b19d2..9f6634913 100644 --- a/src/xenia/gpu/gl4/texture_cache.cc +++ b/src/xenia/gpu/gl4/texture_cache.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/gl4/texture_cache.h" -#include -#include -#include +#include "poly/assert.h" +#include "poly/math.h" +#include "xenia/gpu/gpu-private.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/texture_cache.h b/src/xenia/gpu/gl4/texture_cache.h index 8eedfc476..1eede404a 100644 --- a/src/xenia/gpu/gl4/texture_cache.h +++ b/src/xenia/gpu/gl4/texture_cache.h @@ -14,11 +14,11 @@ #include #include -#include -#include -#include -#include -#include +#include "xenia/gpu/gl4/circular_buffer.h" +#include "xenia/gpu/gl4/gl_context.h" +#include "xenia/gpu/sampler_info.h" +#include "xenia/gpu/texture_info.h" +#include "xenia/memory.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/wgl_control.cc b/src/xenia/gpu/gl4/wgl_control.cc index 6a83c1b38..5b1c56c4d 100644 --- a/src/xenia/gpu/gl4/wgl_control.cc +++ b/src/xenia/gpu/gl4/wgl_control.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/gl4/wgl_control.h" -#include -#include -#include -#include +#include "poly/assert.h" +#include "poly/logging.h" +#include "xenia/gpu/gl4/gl4_gpu-private.h" +#include "xenia/profiling.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gl4/wgl_control.h b/src/xenia/gpu/gl4/wgl_control.h index f180a6eb3..bced21022 100644 --- a/src/xenia/gpu/gl4/wgl_control.h +++ b/src/xenia/gpu/gl4/wgl_control.h @@ -12,10 +12,10 @@ #include -#include -#include -#include -#include +#include "poly/threading.h" +#include "poly/ui/loop.h" +#include "poly/ui/win32/win32_control.h" +#include "xenia/gpu/gl4/gl_context.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/gpu.cc b/src/xenia/gpu/gpu.cc index 47d773362..ec0037f64 100644 --- a/src/xenia/gpu/gpu.cc +++ b/src/xenia/gpu/gpu.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include -#include +#include "xenia/gpu/gpu.h" +#include "xenia/gpu/gpu-private.h" // TODO(benvanik): based on platform. -#include +#include "xenia/gpu/gl4/gl4_gpu.h" DEFINE_string(gpu, "any", "Graphics system. Use: [any, gl4]"); diff --git a/src/xenia/gpu/gpu.h b/src/xenia/gpu/gpu.h index 1a3aa06a7..88541f2ca 100644 --- a/src/xenia/gpu/gpu.h +++ b/src/xenia/gpu/gpu.h @@ -12,7 +12,7 @@ #include -#include +#include "xenia/gpu/graphics_system.h" namespace xe { class Emulator; diff --git a/src/xenia/gpu/graphics_system.cc b/src/xenia/gpu/graphics_system.cc index 89eca968e..47fce8166 100644 --- a/src/xenia/gpu/graphics_system.cc +++ b/src/xenia/gpu/graphics_system.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/graphics_system.h" -#include -#include -#include -#include +#include "poly/poly.h" +#include "xenia/emulator.h" +#include "xenia/cpu/processor.h" +#include "xenia/gpu/gpu-private.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/graphics_system.h b/src/xenia/gpu/graphics_system.h index 024979110..fd3184ab0 100644 --- a/src/xenia/gpu/graphics_system.h +++ b/src/xenia/gpu/graphics_system.h @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/emulator.h" +#include "xenia/xbox.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/register_file.cc b/src/xenia/gpu/register_file.cc index e388d926f..a3d25e035 100644 --- a/src/xenia/gpu/register_file.cc +++ b/src/xenia/gpu/register_file.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/register_file.h" namespace xe { namespace gpu { @@ -19,7 +19,7 @@ const char* RegisterFile::GetRegisterName(uint32_t index) { #define XE_GPU_REGISTER(index, type, name) \ case index: \ return #name; -#include +#include "xenia/gpu/register_table.inc" #undef XE_GPU_REGISTER default: return nullptr; diff --git a/src/xenia/gpu/register_file.h b/src/xenia/gpu/register_file.h index 0b4b84ca5..9ac14d4d7 100644 --- a/src/xenia/gpu/register_file.h +++ b/src/xenia/gpu/register_file.h @@ -10,14 +10,14 @@ #ifndef XENIA_GPU_REGISTER_FILE_H_ #define XENIA_GPU_REGISTER_FILE_H_ -#include +#include "xenia/common.h" namespace xe { namespace gpu { enum Register { #define XE_GPU_REGISTER(index, type, name) XE_GPU_REG_##name = index, -#include +#include "xenia/gpu/register_table.inc" #undef XE_GPU_REGISTER }; diff --git a/src/xenia/gpu/sampler_info.cc b/src/xenia/gpu/sampler_info.cc index 78c023656..e7d6dcf9c 100644 --- a/src/xenia/gpu/sampler_info.cc +++ b/src/xenia/gpu/sampler_info.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/sampler_info.h" -#include +#include "third_party/xxhash/xxhash.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/sampler_info.h b/src/xenia/gpu/sampler_info.h index 57abfb4b9..c89b582ea 100644 --- a/src/xenia/gpu/sampler_info.h +++ b/src/xenia/gpu/sampler_info.h @@ -10,8 +10,8 @@ #ifndef XENIA_GPU_SAMPLER_INFO_H_ #define XENIA_GPU_SAMPLER_INFO_H_ -#include -#include +#include "xenia/gpu/ucode.h" +#include "xenia/gpu/xenos.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/shader.cc b/src/xenia/gpu/shader.cc index c79d51727..85f41fc4f 100644 --- a/src/xenia/gpu/shader.cc +++ b/src/xenia/gpu/shader.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/shader.h" -#include -#include +#include "poly/math.h" +#include "xenia/gpu/ucode_disassembler.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/shader.h b/src/xenia/gpu/shader.h index 5983b851d..cd24e9281 100644 --- a/src/xenia/gpu/shader.h +++ b/src/xenia/gpu/shader.h @@ -13,8 +13,8 @@ #include #include -#include -#include +#include "xenia/gpu/ucode.h" +#include "xenia/gpu/xenos.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/texture_info.cc b/src/xenia/gpu/texture_info.cc index 38eb711c8..04e808c13 100644 --- a/src/xenia/gpu/texture_info.cc +++ b/src/xenia/gpu/texture_info.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "xenia/gpu/texture_info.h" -#include +#include "third_party/xxhash/xxhash.h" -#include +#include "poly/math.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/texture_info.h b/src/xenia/gpu/texture_info.h index 1ebaee00e..fcf37a9b2 100644 --- a/src/xenia/gpu/texture_info.h +++ b/src/xenia/gpu/texture_info.h @@ -10,8 +10,8 @@ #ifndef XENIA_GPU_TEXTURE_INFO_H_ #define XENIA_GPU_TEXTURE_INFO_H_ -#include -#include +#include "xenia/gpu/ucode.h" +#include "xenia/gpu/xenos.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/ucode.h b/src/xenia/gpu/ucode.h index 7cf15d0a8..0152feeaf 100644 --- a/src/xenia/gpu/ucode.h +++ b/src/xenia/gpu/ucode.h @@ -10,7 +10,7 @@ #ifndef XENIA_GPU_UCODE_H_ #define XENIA_GPU_UCODE_H_ -#include +#include "xenia/common.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/ucode_disassembler.cc b/src/xenia/gpu/ucode_disassembler.cc index 61ba345c6..3822d7f3a 100644 --- a/src/xenia/gpu/ucode_disassembler.cc +++ b/src/xenia/gpu/ucode_disassembler.cc @@ -30,7 +30,7 @@ * SOFTWARE. */ -#include +#include "xenia/gpu/ucode_disassembler.h" #include #include diff --git a/src/xenia/gpu/ucode_disassembler.h b/src/xenia/gpu/ucode_disassembler.h index bd5ab4eff..22d09eb09 100644 --- a/src/xenia/gpu/ucode_disassembler.h +++ b/src/xenia/gpu/ucode_disassembler.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "xenia/gpu/ucode.h" +#include "xenia/gpu/xenos.h" namespace xe { namespace gpu { diff --git a/src/xenia/gpu/xenos.h b/src/xenia/gpu/xenos.h index 3b8446e27..5860b9e35 100644 --- a/src/xenia/gpu/xenos.h +++ b/src/xenia/gpu/xenos.h @@ -10,8 +10,8 @@ #ifndef XENIA_GPU_XENOS_H_ #define XENIA_GPU_XENOS_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/gpu/ucode.h" namespace xe { namespace gpu { diff --git a/src/xenia/hid/hid.cc b/src/xenia/hid/hid.cc index a31e40fd8..c7fcfade8 100644 --- a/src/xenia/hid/hid.cc +++ b/src/xenia/hid/hid.cc @@ -7,19 +7,19 @@ ****************************************************************************** */ -#include -#include -#include +#include "xenia/hid/hid.h" +#include "xenia/hid/hid-private.h" +#include "xenia/hid/input_driver.h" using namespace xe; using namespace xe::hid; DEFINE_string(hid, "any", "Input system. Use: [any, nop, winkey, xinput]"); -#include +#include "xenia/hid/nop/nop_hid.h" #if XE_PLATFORM_WIN32 -#include -#include +#include "xenia/hid/winkey/winkey_hid.h" +#include "xenia/hid/xinput/xinput_hid.h" #endif // WIN32 std::unique_ptr xe::hid::Create(Emulator* emulator) { diff --git a/src/xenia/hid/hid.h b/src/xenia/hid/hid.h index ca589e150..597ad0540 100644 --- a/src/xenia/hid/hid.h +++ b/src/xenia/hid/hid.h @@ -12,7 +12,7 @@ #include -#include +#include "xenia/hid/input_system.h" namespace xe { class Emulator; diff --git a/src/xenia/hid/input_driver.cc b/src/xenia/hid/input_driver.cc index a7017b03b..b74c0035c 100644 --- a/src/xenia/hid/input_driver.cc +++ b/src/xenia/hid/input_driver.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "xenia/hid/input_driver.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/input_driver.h b/src/xenia/hid/input_driver.h index 4c8ecfd06..cac274ceb 100644 --- a/src/xenia/hid/input_driver.h +++ b/src/xenia/hid/input_driver.h @@ -10,8 +10,8 @@ #ifndef XENIA_HID_INPUT_DRIVER_H_ #define XENIA_HID_INPUT_DRIVER_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/xbox.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/input_system.cc b/src/xenia/hid/input_system.cc index 0c0431118..017791f29 100644 --- a/src/xenia/hid/input_system.cc +++ b/src/xenia/hid/input_system.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "xenia/hid/input_system.h" -#include -#include -#include +#include "xenia/emulator.h" +#include "xenia/cpu/processor.h" +#include "xenia/hid/input_driver.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/input_system.h b/src/xenia/hid/input_system.h index 3f71866a6..adcac38ff 100644 --- a/src/xenia/hid/input_system.h +++ b/src/xenia/hid/input_system.h @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/emulator.h" +#include "xenia/xbox.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/nop/nop_hid-private.h b/src/xenia/hid/nop/nop_hid-private.h index a4460606c..6205b8e4a 100644 --- a/src/xenia/hid/nop/nop_hid-private.h +++ b/src/xenia/hid/nop/nop_hid-private.h @@ -10,8 +10,8 @@ #ifndef XENIA_HID_NOP_NOP_HID_PRIVATE_H_ #define XENIA_HID_NOP_NOP_HID_PRIVATE_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/hid/nop/nop_hid.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/nop/nop_hid.cc b/src/xenia/hid/nop/nop_hid.cc index 86240e9ae..c15ccdadd 100644 --- a/src/xenia/hid/nop/nop_hid.cc +++ b/src/xenia/hid/nop/nop_hid.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/hid/nop/nop_hid.h" -#include +#include "xenia/hid/nop/nop_input_driver.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/nop/nop_hid.h b/src/xenia/hid/nop/nop_hid.h index d401ce54a..11571dabd 100644 --- a/src/xenia/hid/nop/nop_hid.h +++ b/src/xenia/hid/nop/nop_hid.h @@ -12,7 +12,7 @@ #include -#include +#include "xenia/common.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/nop/nop_input_driver.cc b/src/xenia/hid/nop/nop_input_driver.cc index 459391c77..d4d392d06 100644 --- a/src/xenia/hid/nop/nop_input_driver.cc +++ b/src/xenia/hid/nop/nop_input_driver.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/hid/nop/nop_input_driver.h" -#include +#include "xenia/hid/hid-private.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/nop/nop_input_driver.h b/src/xenia/hid/nop/nop_input_driver.h index 7be53bf16..7203d9d55 100644 --- a/src/xenia/hid/nop/nop_input_driver.h +++ b/src/xenia/hid/nop/nop_input_driver.h @@ -10,9 +10,9 @@ #ifndef XENIA_HID_NOP_NOP_INPUT_DRIVER_H_ #define XENIA_HID_NOP_NOP_INPUT_DRIVER_H_ -#include -#include -#include +#include "xenia/common.h" +#include "xenia/hid/input_driver.h" +#include "xenia/hid/nop/nop_hid-private.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/winkey/winkey_hid-private.h b/src/xenia/hid/winkey/winkey_hid-private.h index da925e722..c51f1b3ab 100644 --- a/src/xenia/hid/winkey/winkey_hid-private.h +++ b/src/xenia/hid/winkey/winkey_hid-private.h @@ -10,8 +10,8 @@ #ifndef XENIA_HID_WINKEY_WINKEY_HID_PRIVATE_H_ #define XENIA_HID_WINKEY_WINKEY_HID_PRIVATE_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/hid/winkey/winkey_hid.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/winkey/winkey_hid.cc b/src/xenia/hid/winkey/winkey_hid.cc index d837a6548..2e3db1f09 100644 --- a/src/xenia/hid/winkey/winkey_hid.cc +++ b/src/xenia/hid/winkey/winkey_hid.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/hid/winkey/winkey_hid.h" -#include +#include "xenia/hid/winkey/winkey_input_driver.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/winkey/winkey_hid.h b/src/xenia/hid/winkey/winkey_hid.h index cfdec12e1..9339bf356 100644 --- a/src/xenia/hid/winkey/winkey_hid.h +++ b/src/xenia/hid/winkey/winkey_hid.h @@ -12,7 +12,7 @@ #include -#include +#include "xenia/common.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/winkey/winkey_input_driver.cc b/src/xenia/hid/winkey/winkey_input_driver.cc index 9f2e83653..a3cf3fbd0 100644 --- a/src/xenia/hid/winkey/winkey_input_driver.cc +++ b/src/xenia/hid/winkey/winkey_input_driver.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/hid/winkey/winkey_input_driver.h" -#include +#include "xenia/hid/hid-private.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/winkey/winkey_input_driver.h b/src/xenia/hid/winkey/winkey_input_driver.h index 16bc51461..60ef6d1bc 100644 --- a/src/xenia/hid/winkey/winkey_input_driver.h +++ b/src/xenia/hid/winkey/winkey_input_driver.h @@ -10,9 +10,9 @@ #ifndef XENIA_HID_WINKEY_WINKEY_DRIVER_H_ #define XENIA_HID_WINKEY_WINKEY_DRIVER_H_ -#include -#include -#include +#include "xenia/common.h" +#include "xenia/hid/input_driver.h" +#include "xenia/hid/nop/nop_hid-private.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/xinput/xinput_hid-private.h b/src/xenia/hid/xinput/xinput_hid-private.h index c9dc937ae..b6beed6f4 100644 --- a/src/xenia/hid/xinput/xinput_hid-private.h +++ b/src/xenia/hid/xinput/xinput_hid-private.h @@ -10,8 +10,8 @@ #ifndef XENIA_HID_XINPUT_XINPUT_HID_PRIVATE_H_ #define XENIA_HID_XINPUT_XINPUT_HID_PRIVATE_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/hid/xinput/xinput_hid.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/xinput/xinput_hid.cc b/src/xenia/hid/xinput/xinput_hid.cc index 1535d9a19..019e36d61 100644 --- a/src/xenia/hid/xinput/xinput_hid.cc +++ b/src/xenia/hid/xinput/xinput_hid.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/hid/xinput/xinput_hid.h" -#include +#include "xenia/hid/xinput/xinput_input_driver.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/xinput/xinput_hid.h b/src/xenia/hid/xinput/xinput_hid.h index 7fbca77cf..859ef88ab 100644 --- a/src/xenia/hid/xinput/xinput_hid.h +++ b/src/xenia/hid/xinput/xinput_hid.h @@ -12,7 +12,7 @@ #include -#include +#include "xenia/common.h" namespace xe { namespace hid { diff --git a/src/xenia/hid/xinput/xinput_input_driver.cc b/src/xenia/hid/xinput/xinput_input_driver.cc index cad5edadb..1a19bc74a 100644 --- a/src/xenia/hid/xinput/xinput_input_driver.cc +++ b/src/xenia/hid/xinput/xinput_input_driver.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/hid/xinput/xinput_input_driver.h" -#include +#include "xenia/hid/hid-private.h" #include diff --git a/src/xenia/hid/xinput/xinput_input_driver.h b/src/xenia/hid/xinput/xinput_input_driver.h index c780b7df4..e8a83c830 100644 --- a/src/xenia/hid/xinput/xinput_input_driver.h +++ b/src/xenia/hid/xinput/xinput_input_driver.h @@ -10,9 +10,9 @@ #ifndef XENIA_HID_XINPUT_XINPUT_DRIVER_H_ #define XENIA_HID_XINPUT_XINPUT_DRIVER_H_ -#include -#include -#include +#include "xenia/common.h" +#include "xenia/hid/input_driver.h" +#include "xenia/hid/nop/nop_hid-private.h" namespace xe { namespace hid { diff --git a/src/xenia/kernel/app.cc b/src/xenia/kernel/app.cc index 3216a32fc..12deb5ce7 100644 --- a/src/xenia/kernel/app.cc +++ b/src/xenia/kernel/app.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/app.h" -#include +#include "xenia/kernel/kernel_state.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/app.h b/src/xenia/kernel/app.h index 1608a4162..c30144479 100644 --- a/src/xenia/kernel/app.h +++ b/src/xenia/kernel/app.h @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/memory.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/apps/apps.cc b/src/xenia/kernel/apps/apps.cc index 88fbb40b5..9fa4a6057 100644 --- a/src/xenia/kernel/apps/apps.cc +++ b/src/xenia/kernel/apps/apps.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/apps/apps.h" -#include +#include "xenia/kernel/apps/xmp_app.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/apps/apps.h b/src/xenia/kernel/apps/apps.h index 9c0d2477c..fa6be30b0 100644 --- a/src/xenia/kernel/apps/apps.h +++ b/src/xenia/kernel/apps/apps.h @@ -10,9 +10,9 @@ #ifndef XENIA_KERNEL_XBOXKRNL_APPS_APPS_H_ #define XENIA_KERNEL_XBOXKRNL_APPS_APPS_H_ -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/app.h" +#include "xenia/kernel/kernel_state.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/apps/xmp_app.cc b/src/xenia/kernel/apps/xmp_app.cc index 3d04be800..27b99233f 100644 --- a/src/xenia/kernel/apps/xmp_app.cc +++ b/src/xenia/kernel/apps/xmp_app.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/apps/xmp_app.h" -#include +#include "poly/threading.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/apps/xmp_app.h b/src/xenia/kernel/apps/xmp_app.h index 0b1658f17..3c2b50640 100644 --- a/src/xenia/kernel/apps/xmp_app.h +++ b/src/xenia/kernel/apps/xmp_app.h @@ -16,9 +16,9 @@ #include #include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/app.h" +#include "xenia/kernel/kernel_state.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/async_request.cc b/src/xenia/kernel/async_request.cc index f9165a188..337128858 100644 --- a/src/xenia/kernel/async_request.cc +++ b/src/xenia/kernel/async_request.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/async_request.h" -#include -#include +#include "xenia/kernel/xobject.h" +#include "xenia/kernel/objects/xevent.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/async_request.h b/src/xenia/kernel/async_request.h index 1da5fa18a..a75a0f8a5 100644 --- a/src/xenia/kernel/async_request.h +++ b/src/xenia/kernel/async_request.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "xenia/common.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/dispatcher.cc b/src/xenia/kernel/dispatcher.cc index aa6349b34..a57d7a218 100644 --- a/src/xenia/kernel/dispatcher.cc +++ b/src/xenia/kernel/dispatcher.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/dispatcher.h" -#include -#include +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/native_list.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/dispatcher.h b/src/xenia/kernel/dispatcher.h index e06a4e823..7e5875612 100644 --- a/src/xenia/kernel/dispatcher.h +++ b/src/xenia/kernel/dispatcher.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "xenia/common.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/device.cc b/src/xenia/kernel/fs/device.cc index bec6f33d1..d658ab0e6 100644 --- a/src/xenia/kernel/fs/device.cc +++ b/src/xenia/kernel/fs/device.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/fs/device.h" -#include +#include "xenia/kernel/objects/xfile.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/device.h b/src/xenia/kernel/fs/device.h index f6aa4ab11..2dc2ebee8 100644 --- a/src/xenia/kernel/fs/device.h +++ b/src/xenia/kernel/fs/device.h @@ -13,8 +13,8 @@ #include #include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/fs/entry.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/disc_image_device.cc b/src/xenia/kernel/fs/devices/disc_image_device.cc index 1bbb5a109..57a7bd0b9 100644 --- a/src/xenia/kernel/fs/devices/disc_image_device.cc +++ b/src/xenia/kernel/fs/devices/disc_image_device.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/fs/devices/disc_image_device.h" -#include -#include -#include +#include "poly/math.h" +#include "xenia/kernel/fs/gdfx.h" +#include "xenia/kernel/fs/devices/disc_image_entry.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/disc_image_device.h b/src/xenia/kernel/fs/devices/disc_image_device.h index 85af80883..5f398982f 100644 --- a/src/xenia/kernel/fs/devices/disc_image_device.h +++ b/src/xenia/kernel/fs/devices/disc_image_device.h @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include "poly/mapped_memory.h" +#include "xenia/common.h" +#include "xenia/kernel/fs/device.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/disc_image_entry.cc b/src/xenia/kernel/fs/devices/disc_image_entry.cc index ea4c90555..10c1eeff2 100644 --- a/src/xenia/kernel/fs/devices/disc_image_entry.cc +++ b/src/xenia/kernel/fs/devices/disc_image_entry.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/fs/devices/disc_image_entry.h" #include -#include -#include +#include "xenia/kernel/fs/gdfx.h" +#include "xenia/kernel/fs/devices/disc_image_file.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/disc_image_entry.h b/src/xenia/kernel/fs/devices/disc_image_entry.h index 019abc46a..96bac1195 100644 --- a/src/xenia/kernel/fs/devices/disc_image_entry.h +++ b/src/xenia/kernel/fs/devices/disc_image_entry.h @@ -12,9 +12,9 @@ #include -#include -#include -#include +#include "poly/mapped_memory.h" +#include "xenia/common.h" +#include "xenia/kernel/fs/entry.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/disc_image_file.cc b/src/xenia/kernel/fs/devices/disc_image_file.cc index 1efb68b3f..d7c7cebb4 100644 --- a/src/xenia/kernel/fs/devices/disc_image_file.cc +++ b/src/xenia/kernel/fs/devices/disc_image_file.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/fs/devices/disc_image_file.h" #include -#include -#include -#include +#include "xenia/kernel/fs/device.h" +#include "xenia/kernel/fs/devices/disc_image_entry.h" +#include "xenia/kernel/fs/gdfx.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/disc_image_file.h b/src/xenia/kernel/fs/devices/disc_image_file.h index 95e5bb83d..04926a8eb 100644 --- a/src/xenia/kernel/fs/devices/disc_image_file.h +++ b/src/xenia/kernel/fs/devices/disc_image_file.h @@ -10,8 +10,8 @@ #ifndef XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_FILE_H_ #define XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_FILE_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/objects/xfile.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/host_path_device.cc b/src/xenia/kernel/fs/devices/host_path_device.cc index 309a389a9..faec9d8e4 100644 --- a/src/xenia/kernel/fs/devices/host_path_device.cc +++ b/src/xenia/kernel/fs/devices/host_path_device.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/fs/devices/host_path_device.h" -#include -#include +#include "xenia/kernel/fs/devices/host_path_entry.h" +#include "xenia/kernel/objects/xfile.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/host_path_device.h b/src/xenia/kernel/fs/devices/host_path_device.h index 80f618e05..0dc6d5bff 100644 --- a/src/xenia/kernel/fs/devices/host_path_device.h +++ b/src/xenia/kernel/fs/devices/host_path_device.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/fs/device.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/host_path_entry.cc b/src/xenia/kernel/fs/devices/host_path_entry.cc index 037bb4f2d..ff71ecef9 100644 --- a/src/xenia/kernel/fs/devices/host_path_entry.cc +++ b/src/xenia/kernel/fs/devices/host_path_entry.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/fs/devices/host_path_entry.h" -#include -#include +#include "poly/mapped_memory.h" +#include "xenia/kernel/fs/devices/host_path_file.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/host_path_entry.h b/src/xenia/kernel/fs/devices/host_path_entry.h index ca156b93a..b55dcbcae 100644 --- a/src/xenia/kernel/fs/devices/host_path_entry.h +++ b/src/xenia/kernel/fs/devices/host_path_entry.h @@ -10,8 +10,8 @@ #ifndef XENIA_KERNEL_FS_DEVICES_HOST_PATH_ENTRY_H_ #define XENIA_KERNEL_FS_DEVICES_HOST_PATH_ENTRY_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/fs/entry.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/host_path_file.cc b/src/xenia/kernel/fs/devices/host_path_file.cc index eafd2cd1f..3d52d818c 100644 --- a/src/xenia/kernel/fs/devices/host_path_file.cc +++ b/src/xenia/kernel/fs/devices/host_path_file.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/fs/devices/host_path_file.h" -#include -#include +#include "xenia/kernel/fs/device.h" +#include "xenia/kernel/fs/devices/host_path_entry.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/host_path_file.h b/src/xenia/kernel/fs/devices/host_path_file.h index cbd59c083..5e66249ce 100644 --- a/src/xenia/kernel/fs/devices/host_path_file.h +++ b/src/xenia/kernel/fs/devices/host_path_file.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/objects/xfile.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/stfs_container_device.cc b/src/xenia/kernel/fs/devices/stfs_container_device.cc index 0704f8b4a..443589dac 100644 --- a/src/xenia/kernel/fs/devices/stfs_container_device.cc +++ b/src/xenia/kernel/fs/devices/stfs_container_device.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/fs/devices/stfs_container_device.h" -#include -#include -#include -#include +#include "poly/math.h" +#include "xenia/kernel/fs/stfs.h" +#include "xenia/kernel/fs/devices/stfs_container_entry.h" +#include "xenia/kernel/objects/xfile.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/stfs_container_device.h b/src/xenia/kernel/fs/devices/stfs_container_device.h index 1f5dd7607..99b6de654 100644 --- a/src/xenia/kernel/fs/devices/stfs_container_device.h +++ b/src/xenia/kernel/fs/devices/stfs_container_device.h @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include "poly/mapped_memory.h" +#include "xenia/common.h" +#include "xenia/kernel/fs/device.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/stfs_container_entry.cc b/src/xenia/kernel/fs/devices/stfs_container_entry.cc index c28cff9e8..d3565c95b 100644 --- a/src/xenia/kernel/fs/devices/stfs_container_entry.cc +++ b/src/xenia/kernel/fs/devices/stfs_container_entry.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/fs/devices/stfs_container_entry.h" -#include -#include +#include "xenia/kernel/fs/stfs.h" +#include "xenia/kernel/fs/devices/stfs_container_file.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/stfs_container_entry.h b/src/xenia/kernel/fs/devices/stfs_container_entry.h index 8cd6d0729..1e75aef47 100644 --- a/src/xenia/kernel/fs/devices/stfs_container_entry.h +++ b/src/xenia/kernel/fs/devices/stfs_container_entry.h @@ -12,9 +12,9 @@ #include -#include -#include -#include +#include "poly/mapped_memory.h" +#include "xenia/common.h" +#include "xenia/kernel/fs/entry.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/stfs_container_file.cc b/src/xenia/kernel/fs/devices/stfs_container_file.cc index 2baffba9c..77ef51b3d 100644 --- a/src/xenia/kernel/fs/devices/stfs_container_file.cc +++ b/src/xenia/kernel/fs/devices/stfs_container_file.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/fs/devices/stfs_container_file.h" #include -#include -#include -#include +#include "xenia/kernel/fs/device.h" +#include "xenia/kernel/fs/devices/stfs_container_entry.h" +#include "xenia/kernel/fs/stfs.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/devices/stfs_container_file.h b/src/xenia/kernel/fs/devices/stfs_container_file.h index d468130ca..64bff0c80 100644 --- a/src/xenia/kernel/fs/devices/stfs_container_file.h +++ b/src/xenia/kernel/fs/devices/stfs_container_file.h @@ -10,8 +10,8 @@ #ifndef XENIA_KERNEL_FS_DEVICES_STFS_CONTAINER_FILE_H_ #define XENIA_KERNEL_FS_DEVICES_STFS_CONTAINER_FILE_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/objects/xfile.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/entry.cc b/src/xenia/kernel/fs/entry.cc index 448207229..2af001932 100644 --- a/src/xenia/kernel/fs/entry.cc +++ b/src/xenia/kernel/fs/entry.cc @@ -7,8 +7,8 @@ ****************************************************************************** */ -#include -#include +#include "xenia/kernel/fs/entry.h" +#include "xenia/kernel/fs/device.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/entry.h b/src/xenia/kernel/fs/entry.h index 3959d083c..0553c53ad 100644 --- a/src/xenia/kernel/fs/entry.h +++ b/src/xenia/kernel/fs/entry.h @@ -13,8 +13,8 @@ #include #include -#include -#include +#include "xenia/common.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/filesystem.cc b/src/xenia/kernel/fs/filesystem.cc index 87be60c1e..fa97b9478 100644 --- a/src/xenia/kernel/fs/filesystem.cc +++ b/src/xenia/kernel/fs/filesystem.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/fs/filesystem.h" -#include -#include -#include -#include +#include "poly/string.h" +#include "xenia/kernel/fs/devices/disc_image_device.h" +#include "xenia/kernel/fs/devices/host_path_device.h" +#include "xenia/kernel/fs/devices/stfs_container_device.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/filesystem.h b/src/xenia/kernel/fs/filesystem.h index 54239cacb..690ea4284 100644 --- a/src/xenia/kernel/fs/filesystem.h +++ b/src/xenia/kernel/fs/filesystem.h @@ -15,8 +15,8 @@ #include #include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/fs/entry.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/gdfx.cc b/src/xenia/kernel/fs/gdfx.cc index 7eb8b43b2..956044374 100644 --- a/src/xenia/kernel/fs/gdfx.cc +++ b/src/xenia/kernel/fs/gdfx.cc @@ -9,9 +9,9 @@ * - abgx360 */ -#include +#include "xenia/kernel/fs/gdfx.h" -#include +#include "poly/math.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/gdfx.h b/src/xenia/kernel/fs/gdfx.h index b829efcdf..7fe2817a1 100644 --- a/src/xenia/kernel/fs/gdfx.h +++ b/src/xenia/kernel/fs/gdfx.h @@ -12,10 +12,10 @@ #include -#include -#include -#include -#include +#include "poly/mapped_memory.h" +#include "xenia/common.h" +#include "xenia/xbox.h" +#include "xenia/kernel/fs/entry.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/fs/stfs.cc b/src/xenia/kernel/fs/stfs.cc index bc0483bff..036703a52 100644 --- a/src/xenia/kernel/fs/stfs.cc +++ b/src/xenia/kernel/fs/stfs.cc @@ -9,7 +9,7 @@ * - free60 */ -#include +#include "xenia/kernel/fs/stfs.h" #include diff --git a/src/xenia/kernel/fs/stfs.h b/src/xenia/kernel/fs/stfs.h index 7d29cf204..03d13bbff 100644 --- a/src/xenia/kernel/fs/stfs.h +++ b/src/xenia/kernel/fs/stfs.h @@ -13,10 +13,10 @@ #include #include -#include -#include -#include -#include +#include "poly/mapped_memory.h" +#include "xenia/common.h" +#include "xenia/xbox.h" +#include "xenia/kernel/fs/entry.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/kernel.h b/src/xenia/kernel/kernel.h index 21c3a5cc2..e8a096cb0 100644 --- a/src/xenia/kernel/kernel.h +++ b/src/xenia/kernel/kernel.h @@ -10,6 +10,6 @@ #ifndef XENIA_KERNEL_KERNEL_H_ #define XENIA_KERNEL_KERNEL_H_ -#include +#include "xenia/kernel/modules.h" #endif // XENIA_KERNEL_KERNEL_H_ diff --git a/src/xenia/kernel/kernel_state.cc b/src/xenia/kernel/kernel_state.cc index c6fad30db..383dbe215 100644 --- a/src/xenia/kernel/kernel_state.cc +++ b/src/xenia/kernel/kernel_state.cc @@ -7,20 +7,20 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/kernel_state.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "xenia/emulator.h" +#include "xenia/kernel/dispatcher.h" +#include "xenia/kernel/xam_module.h" +#include "xenia/kernel/xboxkrnl_module.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/kernel/xobject.h" +#include "xenia/kernel/apps/apps.h" +#include "xenia/kernel/objects/xevent.h" +#include "xenia/kernel/objects/xmodule.h" +#include "xenia/kernel/objects/xnotify_listener.h" +#include "xenia/kernel/objects/xthread.h" +#include "xenia/kernel/objects/xuser_module.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/kernel_state.h b/src/xenia/kernel/kernel_state.h index ae690e21f..ebe668f44 100644 --- a/src/xenia/kernel/kernel_state.h +++ b/src/xenia/kernel/kernel_state.h @@ -13,14 +13,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/export_resolver.h" +#include "xenia/kernel/app.h" +#include "xenia/kernel/fs/filesystem.h" +#include "xenia/kernel/object_table.h" +#include "xenia/kernel/user_profile.h" +#include "xenia/memory.h" +#include "xenia/xbox.h" namespace xe { class Emulator; diff --git a/src/xenia/kernel/modules.h b/src/xenia/kernel/modules.h index 45e5817e8..662db1894 100644 --- a/src/xenia/kernel/modules.h +++ b/src/xenia/kernel/modules.h @@ -10,7 +10,7 @@ #ifndef XENIA_KERNEL_MODULES_H_ #define XENIA_KERNEL_MODULES_H_ -#include -#include +#include "xenia/kernel/xam_module.h" +#include "xenia/kernel/xboxkrnl_module.h" #endif // XENIA_KERNEL_MODULES_H_ diff --git a/src/xenia/kernel/native_list.cc b/src/xenia/kernel/native_list.cc index 6a301e940..3a087ef27 100644 --- a/src/xenia/kernel/native_list.cc +++ b/src/xenia/kernel/native_list.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/native_list.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/native_list.h b/src/xenia/kernel/native_list.h index d07774a2c..37f9f19bd 100644 --- a/src/xenia/kernel/native_list.h +++ b/src/xenia/kernel/native_list.h @@ -10,9 +10,9 @@ #ifndef XENIA_KERNEL_XBOXKRNL_NATIVE_LIST_H_ #define XENIA_KERNEL_XBOXKRNL_NATIVE_LIST_H_ -#include -#include -#include +#include "xenia/common.h" +#include "xenia/memory.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/object_table.cc b/src/xenia/kernel/object_table.cc index 6240280bb..203c3deb7 100644 --- a/src/xenia/kernel/object_table.cc +++ b/src/xenia/kernel/object_table.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/object_table.h" #include -#include -#include +#include "xenia/kernel/xobject.h" +#include "xenia/kernel/objects/xthread.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/object_table.h b/src/xenia/kernel/object_table.h index f49aa1194..75da74c86 100644 --- a/src/xenia/kernel/object_table.h +++ b/src/xenia/kernel/object_table.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "xenia/common.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xenumerator.cc b/src/xenia/kernel/objects/xenumerator.cc index 3fe25297d..21c0e51e2 100644 --- a/src/xenia/kernel/objects/xenumerator.cc +++ b/src/xenia/kernel/objects/xenumerator.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/objects/xenumerator.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xenumerator.h b/src/xenia/kernel/objects/xenumerator.h index b1bfd0f37..2f6f32499 100644 --- a/src/xenia/kernel/objects/xenumerator.h +++ b/src/xenia/kernel/objects/xenumerator.h @@ -10,8 +10,8 @@ #ifndef XENIA_KERNEL_XBOXKRNL_XENUMERATOR_H_ #define XENIA_KERNEL_XBOXKRNL_XENUMERATOR_H_ -#include -#include +#include "xenia/kernel/xobject.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xevent.cc b/src/xenia/kernel/objects/xevent.cc index e00593409..118759f38 100644 --- a/src/xenia/kernel/objects/xevent.cc +++ b/src/xenia/kernel/objects/xevent.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/objects/xevent.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xevent.h b/src/xenia/kernel/objects/xevent.h index b4e944143..831666a50 100644 --- a/src/xenia/kernel/objects/xevent.h +++ b/src/xenia/kernel/objects/xevent.h @@ -10,8 +10,8 @@ #ifndef XENIA_KERNEL_XBOXKRNL_XEVENT_H_ #define XENIA_KERNEL_XBOXKRNL_XEVENT_H_ -#include -#include +#include "xenia/kernel/xobject.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xfile.cc b/src/xenia/kernel/objects/xfile.cc index 62060bb31..62feacae3 100644 --- a/src/xenia/kernel/objects/xfile.cc +++ b/src/xenia/kernel/objects/xfile.cc @@ -7,10 +7,10 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/objects/xfile.h" -#include -#include +#include "xenia/kernel/async_request.h" +#include "xenia/kernel/objects/xevent.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xfile.h b/src/xenia/kernel/objects/xfile.h index 42057447a..48415b56f 100644 --- a/src/xenia/kernel/objects/xfile.h +++ b/src/xenia/kernel/objects/xfile.h @@ -10,9 +10,9 @@ #ifndef XENIA_KERNEL_XBOXKRNL_XFILE_H_ #define XENIA_KERNEL_XBOXKRNL_XFILE_H_ -#include +#include "xenia/kernel/xobject.h" -#include +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xkernel_module.cc b/src/xenia/kernel/objects/xkernel_module.cc index e9444d7e9..c76803378 100644 --- a/src/xenia/kernel/objects/xkernel_module.cc +++ b/src/xenia/kernel/objects/xkernel_module.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/objects/xkernel_module.h" -#include -#include -#include +#include "xenia/emulator.h" +#include "xenia/cpu/cpu.h" +#include "xenia/kernel/objects/xthread.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xkernel_module.h b/src/xenia/kernel/objects/xkernel_module.h index e2ff4c28b..6c780404b 100644 --- a/src/xenia/kernel/objects/xkernel_module.h +++ b/src/xenia/kernel/objects/xkernel_module.h @@ -10,8 +10,8 @@ #ifndef XENIA_KERNEL_XBOXKRNL_XKERNEL_MODULE_H_ #define XENIA_KERNEL_XBOXKRNL_XKERNEL_MODULE_H_ -#include -#include +#include "xenia/emulator.h" +#include "xenia/kernel/objects/xmodule.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xmodule.cc b/src/xenia/kernel/objects/xmodule.cc index aea7198f9..b64bc265e 100644 --- a/src/xenia/kernel/objects/xmodule.cc +++ b/src/xenia/kernel/objects/xmodule.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/objects/xmodule.h" -#include +#include "xdb/protocol.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xmodule.h b/src/xenia/kernel/objects/xmodule.h index dd5743684..0abe66931 100644 --- a/src/xenia/kernel/objects/xmodule.h +++ b/src/xenia/kernel/objects/xmodule.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "xenia/kernel/xobject.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xmutant.cc b/src/xenia/kernel/objects/xmutant.cc index b915f314e..bb73a6260 100644 --- a/src/xenia/kernel/objects/xmutant.cc +++ b/src/xenia/kernel/objects/xmutant.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/objects/xmutant.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xmutant.h b/src/xenia/kernel/objects/xmutant.h index be554676c..11da04699 100644 --- a/src/xenia/kernel/objects/xmutant.h +++ b/src/xenia/kernel/objects/xmutant.h @@ -10,8 +10,8 @@ #ifndef XENIA_KERNEL_XBOXKRNL_XMUTANT_H_ #define XENIA_KERNEL_XBOXKRNL_XMUTANT_H_ -#include -#include +#include "xenia/kernel/xobject.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xnotify_listener.cc b/src/xenia/kernel/objects/xnotify_listener.cc index 8825de59d..495e9cfde 100644 --- a/src/xenia/kernel/objects/xnotify_listener.cc +++ b/src/xenia/kernel/objects/xnotify_listener.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/objects/xnotify_listener.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xnotify_listener.h b/src/xenia/kernel/objects/xnotify_listener.h index 708230eea..6b5eb7887 100644 --- a/src/xenia/kernel/objects/xnotify_listener.h +++ b/src/xenia/kernel/objects/xnotify_listener.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "xenia/kernel/xobject.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xsemaphore.cc b/src/xenia/kernel/objects/xsemaphore.cc index c8aba8ce3..be1472463 100644 --- a/src/xenia/kernel/objects/xsemaphore.cc +++ b/src/xenia/kernel/objects/xsemaphore.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/objects/xsemaphore.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xsemaphore.h b/src/xenia/kernel/objects/xsemaphore.h index 43fb13e3d..892d3d70a 100644 --- a/src/xenia/kernel/objects/xsemaphore.h +++ b/src/xenia/kernel/objects/xsemaphore.h @@ -10,8 +10,8 @@ #ifndef XENIA_KERNEL_XBOXKRNL_XSEMAPHORE_H_ #define XENIA_KERNEL_XBOXKRNL_XSEMAPHORE_H_ -#include -#include +#include "xenia/kernel/xobject.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xthread.cc b/src/xenia/kernel/objects/xthread.cc index ed80ee3d8..7be0363a8 100644 --- a/src/xenia/kernel/objects/xthread.cc +++ b/src/xenia/kernel/objects/xthread.cc @@ -7,14 +7,14 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/objects/xthread.h" -#include -#include -#include -#include -#include -#include +#include "poly/poly.h" +#include "xdb/protocol.h" +#include "xenia/cpu/cpu.h" +#include "xenia/kernel/native_list.h" +#include "xenia/kernel/objects/xevent.h" +#include "xenia/kernel/objects/xuser_module.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xthread.h b/src/xenia/kernel/objects/xthread.h index 1f676ecba..4a4fad19d 100644 --- a/src/xenia/kernel/objects/xthread.h +++ b/src/xenia/kernel/objects/xthread.h @@ -14,9 +14,9 @@ #include #include -#include -#include -#include +#include "xenia/cpu/xenon_thread_state.h" +#include "xenia/kernel/xobject.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xtimer.cc b/src/xenia/kernel/objects/xtimer.cc index 09c5a3282..35049f80c 100644 --- a/src/xenia/kernel/objects/xtimer.cc +++ b/src/xenia/kernel/objects/xtimer.cc @@ -7,9 +7,9 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/objects/xtimer.h" -#include +#include "xenia/cpu/processor.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xtimer.h b/src/xenia/kernel/objects/xtimer.h index 3b52cd2fc..bf7fffffb 100644 --- a/src/xenia/kernel/objects/xtimer.h +++ b/src/xenia/kernel/objects/xtimer.h @@ -10,8 +10,8 @@ #ifndef XENIA_KERNEL_XBOXKRNL_XTIMER_H_ #define XENIA_KERNEL_XBOXKRNL_XTIMER_H_ -#include -#include +#include "xenia/kernel/xobject.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xuser_module.cc b/src/xenia/kernel/objects/xuser_module.cc index 2f9449448..29bf7f79c 100644 --- a/src/xenia/kernel/objects/xuser_module.cc +++ b/src/xenia/kernel/objects/xuser_module.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/objects/xuser_module.h" -#include -#include -#include -#include +#include "xenia/emulator.h" +#include "xenia/cpu/cpu.h" +#include "xenia/kernel/objects/xfile.h" +#include "xenia/kernel/objects/xthread.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/objects/xuser_module.h b/src/xenia/kernel/objects/xuser_module.h index 5d479c268..4ef694e73 100644 --- a/src/xenia/kernel/objects/xuser_module.h +++ b/src/xenia/kernel/objects/xuser_module.h @@ -10,11 +10,11 @@ #ifndef XENIA_KERNEL_XBOXKRNL_XUSER_MODULE_H_ #define XENIA_KERNEL_XBOXKRNL_XUSER_MODULE_H_ -#include +#include "xenia/kernel/objects/xmodule.h" -#include -#include -#include +#include "xenia/export_resolver.h" +#include "xenia/kernel/util/xex2.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/user_profile.cc b/src/xenia/kernel/user_profile.cc index 9c9a3cfd4..b53a9d0d7 100644 --- a/src/xenia/kernel/user_profile.cc +++ b/src/xenia/kernel/user_profile.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/user_profile.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/user_profile.h b/src/xenia/kernel/user_profile.h index d654396ae..eaccbcd95 100644 --- a/src/xenia/kernel/user_profile.h +++ b/src/xenia/kernel/user_profile.h @@ -15,8 +15,8 @@ #include #include -#include -#include +#include "xenia/common.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/util/export_table_pre.inc b/src/xenia/kernel/util/export_table_pre.inc index a03a01d4c..687591642 100644 --- a/src/xenia/kernel/util/export_table_pre.inc +++ b/src/xenia/kernel/util/export_table_pre.inc @@ -12,11 +12,11 @@ * Use this to build tables of exports: * * // Build the export table used for resolution. - * #include + * #include "xenia/kernel/util/export_table_pre.inc" * static KernelExport my_module_export_table[] = { - * #include + * #include "xenia/kernel/my_module/my_module_table.inc" * }; - * #include + * #include "xenia/kernel/util/export_table_post.inc" * export_resolver_->RegisterTable( * "my_module.xex", * my_module_export_table, poly::countof(my_module_export_table)); diff --git a/src/xenia/kernel/util/ordinal_table_pre.inc b/src/xenia/kernel/util/ordinal_table_pre.inc index 928b44b0c..d80e5098a 100644 --- a/src/xenia/kernel/util/ordinal_table_pre.inc +++ b/src/xenia/kernel/util/ordinal_table_pre.inc @@ -12,13 +12,13 @@ * Use this to build tables of constants describing the ordinals: * * // Build an ordinal enum to make it easy to lookup ordinals. - * #include + * #include "xenia/kernel/util/ordinal_table_pre.inc" * namespace ordinals { * enum { - * #include + * #include "xenia/kernel/my_module/my_module_table.inc" * }; * } // namespace ordinals - * #include + * #include "xenia/kernel/util/ordinal_table_post.inc" */ diff --git a/src/xenia/kernel/util/shim_utils.h b/src/xenia/kernel/util/shim_utils.h index 0ef263435..6b3f6bdd5 100644 --- a/src/xenia/kernel/util/shim_utils.h +++ b/src/xenia/kernel/util/shim_utils.h @@ -10,9 +10,9 @@ #ifndef XENIA_KERNEL_UTIL_SHIM_UTILS_H_ #define XENIA_KERNEL_UTIL_SHIM_UTILS_H_ -#include -#include -#include +#include "alloy/frontend/ppc/ppc_context.h" +#include "xenia/common.h" +#include "xenia/export_resolver.h" namespace xe { diff --git a/src/xenia/kernel/util/xex2.cc b/src/xenia/kernel/util/xex2.cc index 44a6a79bd..a5d62435c 100644 --- a/src/xenia/kernel/util/xex2.cc +++ b/src/xenia/kernel/util/xex2.cc @@ -7,19 +7,19 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/util/xex2.h" #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include "poly/math.h" +#include "third_party/crypto/rijndael-alg-fst.h" +#include "third_party/crypto/rijndael-alg-fst.c" +#include "third_party/mspack/lzx.h" +#include "third_party/mspack/lzxd.c" +#include "third_party/mspack/mspack.h" +#include "third_party/pe/pe_image.h" // using namespace alloy; diff --git a/src/xenia/kernel/util/xex2.h b/src/xenia/kernel/util/xex2.h index bb806648d..fac0a56a6 100644 --- a/src/xenia/kernel/util/xex2.h +++ b/src/xenia/kernel/util/xex2.h @@ -10,9 +10,9 @@ #ifndef XENIA_KERNEL_UTIL_XEX2_H_ #define XENIA_KERNEL_UTIL_XEX2_H_ -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/util/xex2_info.h" +#include "xenia/memory.h" typedef struct { int reserved; } xe_xex2_options_t; diff --git a/src/xenia/kernel/util/xex2_info.h b/src/xenia/kernel/util/xex2_info.h index 6ebdb8674..419be0d23 100644 --- a/src/xenia/kernel/util/xex2_info.h +++ b/src/xenia/kernel/util/xex2_info.h @@ -10,7 +10,7 @@ #ifndef XENIA_KERNEL_XEX2_INFO_H_ #define XENIA_KERNEL_XEX2_INFO_H_ -#include +#include "xenia/common.h" typedef enum { XEX_HEADER_RESOURCE_INFO = 0x000002FF, diff --git a/src/xenia/kernel/xam_content.cc b/src/xenia/kernel/xam_content.cc index 3b1c97a4d..0a87f8f35 100644 --- a/src/xenia/kernel/xam_content.cc +++ b/src/xenia/kernel/xam_content.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xam_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xam_info.cc b/src/xenia/kernel/xam_info.cc index 8109b086a..af51834dd 100644 --- a/src/xenia/kernel/xam_info.cc +++ b/src/xenia/kernel/xam_info.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/objects/xenumerator.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/util/xex2.h" +#include "xenia/kernel/xam_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xam_input.cc b/src/xenia/kernel/xam_input.cc index eafc7dda1..1cf1e326b 100644 --- a/src/xenia/kernel/xam_input.cc +++ b/src/xenia/kernel/xam_input.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/emulator.h" +#include "xenia/hid/hid.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xam_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xam_module.cc b/src/xenia/kernel/xam_module.cc index 8fa2edff0..d32d18bef 100644 --- a/src/xenia/kernel/xam_module.cc +++ b/src/xenia/kernel/xam_module.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/xam_module.h" -#include -#include -#include -#include +#include "poly/math.h" +#include "xenia/export_resolver.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/xam_private.h" namespace xe { namespace kernel { @@ -20,11 +20,11 @@ namespace kernel { XamModule::XamModule(Emulator* emulator, KernelState* kernel_state) : XKernelModule(kernel_state, "xe:\\xam.xex") { // Build the export table used for resolution. -#include +#include "xenia/kernel/util/export_table_pre.inc" static KernelExport xam_export_table[] = { -#include +#include "xenia/kernel/xam_table.inc" }; -#include +#include "xenia/kernel/util/export_table_post.inc" export_resolver_->RegisterTable("xam.xex", xam_export_table, poly::countof(xam_export_table)); diff --git a/src/xenia/kernel/xam_module.h b/src/xenia/kernel/xam_module.h index 353f03ae5..ffa1fb0ab 100644 --- a/src/xenia/kernel/xam_module.h +++ b/src/xenia/kernel/xam_module.h @@ -10,10 +10,10 @@ #ifndef XENIA_KERNEL_XAM_H_ #define XENIA_KERNEL_XAM_H_ -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/export_resolver.h" +#include "xenia/kernel/objects/xkernel_module.h" +#include "xenia/kernel/xam_ordinals.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xam_msg.cc b/src/xenia/kernel/xam_msg.cc index fca069e67..e51f8f5ff 100644 --- a/src/xenia/kernel/xam_msg.cc +++ b/src/xenia/kernel/xam_msg.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/objects/xevent.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xam_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xam_net.cc b/src/xenia/kernel/xam_net.cc index 3ac6ef62c..cbc6035ce 100644 --- a/src/xenia/kernel/xam_net.cc +++ b/src/xenia/kernel/xam_net.cc @@ -9,11 +9,11 @@ #include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xam_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xam_notify.cc b/src/xenia/kernel/xam_notify.cc index 5a93bfb32..417a225cd 100644 --- a/src/xenia/kernel/xam_notify.cc +++ b/src/xenia/kernel/xam_notify.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/objects/xnotify_listener.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xam_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xam_ordinals.h b/src/xenia/kernel/xam_ordinals.h index e7a71561d..b5eeae966 100644 --- a/src/xenia/kernel/xam_ordinals.h +++ b/src/xenia/kernel/xam_ordinals.h @@ -10,16 +10,16 @@ #ifndef XENIA_KERNEL_XAM_ORDINALS_H_ #define XENIA_KERNEL_XAM_ORDINALS_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/export_resolver.h" // Build an ordinal enum to make it easy to lookup ordinals. -#include +#include "xenia/kernel/util/ordinal_table_pre.inc" namespace ordinals { enum { -#include +#include "xenia/kernel/xam_table.inc" }; } // namespace ordinals -#include +#include "xenia/kernel/util/ordinal_table_post.inc" #endif // XENIA_KERNEL_XAM_ORDINALS_H_ diff --git a/src/xenia/kernel/xam_private.h b/src/xenia/kernel/xam_private.h index bca7b2ac8..87f33b060 100644 --- a/src/xenia/kernel/xam_private.h +++ b/src/xenia/kernel/xam_private.h @@ -10,8 +10,8 @@ #ifndef XENIA_KERNEL_XAM_PRIVATE_H_ #define XENIA_KERNEL_XAM_PRIVATE_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/xam_ordinals.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xam_ui.cc b/src/xenia/kernel/xam_ui.cc index 553c43161..f25a20b39 100644 --- a/src/xenia/kernel/xam_ui.cc +++ b/src/xenia/kernel/xam_ui.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xam_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xam_user.cc b/src/xenia/kernel/xam_user.cc index 4b34e5bad..c03a6649d 100644 --- a/src/xenia/kernel/xam_user.cc +++ b/src/xenia/kernel/xam_user.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/objects/xenumerator.h" +#include "xenia/kernel/objects/xthread.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xam_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xam_video.cc b/src/xenia/kernel/xam_video.cc index 4b06939d5..fed42db97 100644 --- a/src/xenia/kernel/xam_video.cc +++ b/src/xenia/kernel/xam_video.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xam_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xam_voice.cc b/src/xenia/kernel/xam_voice.cc index 4bdcc106e..fb48e1009 100644 --- a/src/xenia/kernel/xam_voice.cc +++ b/src/xenia/kernel/xam_voice.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/emulator.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xam_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_audio.cc b/src/xenia/kernel/xboxkrnl_audio.cc index dfd723e10..c942eed79 100644 --- a/src/xenia/kernel/xboxkrnl_audio.cc +++ b/src/xenia/kernel/xboxkrnl_audio.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include -#include +#include "xenia/apu/apu.h" +#include "xenia/common.h" +#include "xenia/emulator.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_debug.cc b/src/xenia/kernel/xboxkrnl_debug.cc index 95aa084d6..a954d3c31 100644 --- a/src/xenia/kernel/xboxkrnl_debug.cc +++ b/src/xenia/kernel/xboxkrnl_debug.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/objects/xthread.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_hal.cc b/src/xenia/kernel/xboxkrnl_hal.cc index 4ba62f831..8c75e65f4 100644 --- a/src/xenia/kernel/xboxkrnl_hal.cc +++ b/src/xenia/kernel/xboxkrnl_hal.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_io.cc b/src/xenia/kernel/xboxkrnl_io.cc index 40dcacff7..074d82cbb 100644 --- a/src/xenia/kernel/xboxkrnl_io.cc +++ b/src/xenia/kernel/xboxkrnl_io.cc @@ -7,15 +7,15 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "poly/memory.h" +#include "xenia/common.h" +#include "xenia/kernel/async_request.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/objects/xevent.h" +#include "xenia/kernel/objects/xfile.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_memory.cc b/src/xenia/kernel/xboxkrnl_memory.cc index 8e40b8278..0a21396fc 100644 --- a/src/xenia/kernel/xboxkrnl_memory.cc +++ b/src/xenia/kernel/xboxkrnl_memory.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include +#include "poly/math.h" +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_misc.cc b/src/xenia/kernel/xboxkrnl_misc.cc index cd2f5ca76..2d09ebc11 100644 --- a/src/xenia/kernel/xboxkrnl_misc.cc +++ b/src/xenia/kernel/xboxkrnl_misc.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/objects/xthread.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_module.cc b/src/xenia/kernel/xboxkrnl_module.cc index 08be07e73..2c07bcd22 100644 --- a/src/xenia/kernel/xboxkrnl_module.cc +++ b/src/xenia/kernel/xboxkrnl_module.cc @@ -7,15 +7,15 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/xboxkrnl_module.h" #include -#include -#include -#include -#include -#include -#include +#include "poly/math.h" +#include "xenia/emulator.h" +#include "xenia/export_resolver.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/kernel/objects/xuser_module.h" DEFINE_bool(abort_before_entry, false, "Abort execution right before launching the module."); @@ -26,11 +26,11 @@ namespace kernel { XboxkrnlModule::XboxkrnlModule(Emulator* emulator, KernelState* kernel_state) : XKernelModule(kernel_state, "xe:\\xboxkrnl.exe") { // Build the export table used for resolution. -#include +#include "xenia/kernel/util/export_table_pre.inc" static KernelExport xboxkrnl_export_table[] = { -#include +#include "xenia/kernel/xboxkrnl_table.inc" }; -#include +#include "xenia/kernel/util/export_table_post.inc" export_resolver_->RegisterTable("xboxkrnl.exe", xboxkrnl_export_table, poly::countof(xboxkrnl_export_table)); diff --git a/src/xenia/kernel/xboxkrnl_module.h b/src/xenia/kernel/xboxkrnl_module.h index d1e97d260..74a7486cb 100644 --- a/src/xenia/kernel/xboxkrnl_module.h +++ b/src/xenia/kernel/xboxkrnl_module.h @@ -10,13 +10,13 @@ #ifndef XENIA_KERNEL_XBOXKRNL_MODULE_H_ #define XENIA_KERNEL_XBOXKRNL_MODULE_H_ -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/export_resolver.h" +#include "xenia/kernel/objects/xkernel_module.h" +#include "xenia/kernel/xboxkrnl_ordinals.h" // All of the exported functions: -#include +#include "xenia/kernel/xboxkrnl_rtl.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_modules.cc b/src/xenia/kernel/xboxkrnl_modules.cc index 1a57e4cdd..b7fdb6eda 100644 --- a/src/xenia/kernel/xboxkrnl_modules.cc +++ b/src/xenia/kernel/xboxkrnl_modules.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/objects/xuser_module.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/util/xex2.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_ob.cc b/src/xenia/kernel/xboxkrnl_ob.cc index a5589e359..7aeb9a4d1 100644 --- a/src/xenia/kernel/xboxkrnl_ob.cc +++ b/src/xenia/kernel/xboxkrnl_ob.cc @@ -7,13 +7,13 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/objects/xthread.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/kernel/xobject.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_ordinals.h b/src/xenia/kernel/xboxkrnl_ordinals.h index 95c0d5087..18d8ee3bc 100644 --- a/src/xenia/kernel/xboxkrnl_ordinals.h +++ b/src/xenia/kernel/xboxkrnl_ordinals.h @@ -10,16 +10,16 @@ #ifndef XENIA_KERNEL_XBOXKRNL_ORDINALS_H_ #define XENIA_KERNEL_XBOXKRNL_ORDINALS_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/export_resolver.h" // Build an ordinal enum to make it easy to lookup ordinals. -#include +#include "xenia/kernel/util/ordinal_table_pre.inc" namespace ordinals { enum { -#include +#include "xenia/kernel/xboxkrnl_table.inc" }; } // namespace ordinals -#include +#include "xenia/kernel/util/ordinal_table_post.inc" #endif // XENIA_KERNEL_XBOXKRNL_ORDINALS_H_ diff --git a/src/xenia/kernel/xboxkrnl_private.h b/src/xenia/kernel/xboxkrnl_private.h index 3bb1bc76a..89e9aeaab 100644 --- a/src/xenia/kernel/xboxkrnl_private.h +++ b/src/xenia/kernel/xboxkrnl_private.h @@ -10,8 +10,8 @@ #ifndef XENIA_KERNEL_XBOXKRNL_PRIVATE_H_ #define XENIA_KERNEL_XBOXKRNL_PRIVATE_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/xboxkrnl_ordinals.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_rtl.cc b/src/xenia/kernel/xboxkrnl_rtl.cc index 8a58f39b0..e1b7ba421 100644 --- a/src/xenia/kernel/xboxkrnl_rtl.cc +++ b/src/xenia/kernel/xboxkrnl_rtl.cc @@ -7,15 +7,15 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/xboxkrnl_rtl.h" -#include -#include -#include -#include -#include -#include -#include +#include "poly/string.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/kernel/objects/xthread.h" +#include "xenia/kernel/objects/xuser_module.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/util/xex2.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_rtl.h b/src/xenia/kernel/xboxkrnl_rtl.h index abec61852..1da3cdce5 100644 --- a/src/xenia/kernel/xboxkrnl_rtl.h +++ b/src/xenia/kernel/xboxkrnl_rtl.h @@ -10,8 +10,8 @@ #ifndef XENIA_KERNEL_XBOXKRNL_RTL_H_ #define XENIA_KERNEL_XBOXKRNL_RTL_H_ -#include -#include +#include "xenia/common.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_strings.cc b/src/xenia/kernel/xboxkrnl_strings.cc index 0c774fbd4..9723f27a7 100644 --- a/src/xenia/kernel/xboxkrnl_strings.cc +++ b/src/xenia/kernel/xboxkrnl_strings.cc @@ -7,14 +7,14 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/objects/xthread.h" +#include "xenia/kernel/objects/xuser_module.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/util/xex2.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_threading.cc b/src/xenia/kernel/xboxkrnl_threading.cc index 89299a2d7..b2dd2946f 100644 --- a/src/xenia/kernel/xboxkrnl_threading.cc +++ b/src/xenia/kernel/xboxkrnl_threading.cc @@ -7,19 +7,19 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/cpu/processor.h" +#include "xenia/kernel/dispatcher.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/native_list.h" +#include "xenia/kernel/objects/xevent.h" +#include "xenia/kernel/objects/xmutant.h" +#include "xenia/kernel/objects/xsemaphore.h" +#include "xenia/kernel/objects/xthread.h" +#include "xenia/kernel/objects/xtimer.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_usbcam.cc b/src/xenia/kernel/xboxkrnl_usbcam.cc index a3625b437..cba1be0da 100644 --- a/src/xenia/kernel/xboxkrnl_usbcam.cc +++ b/src/xenia/kernel/xboxkrnl_usbcam.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xboxkrnl_video.cc b/src/xenia/kernel/xboxkrnl_video.cc index e15489aa7..db49b1288 100644 --- a/src/xenia/kernel/xboxkrnl_video.cc +++ b/src/xenia/kernel/xboxkrnl_video.cc @@ -7,16 +7,16 @@ ****************************************************************************** */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "xenia/common.h" +#include "xenia/cpu/cpu.h" +#include "xenia/emulator.h" +#include "xenia/gpu/graphics_system.h" +#include "xenia/gpu/xenos.h" +#include "xenia/kernel/kernel_state.h" +#include "xenia/kernel/util/shim_utils.h" +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/kernel/xboxkrnl_rtl.h" +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xobject.cc b/src/xenia/kernel/xobject.cc index 2016fe815..736760bf8 100644 --- a/src/xenia/kernel/xobject.cc +++ b/src/xenia/kernel/xobject.cc @@ -7,12 +7,12 @@ ****************************************************************************** */ -#include +#include "xenia/kernel/xobject.h" -#include -#include -#include -#include +#include "xenia/kernel/xboxkrnl_private.h" +#include "xenia/kernel/objects/xevent.h" +#include "xenia/kernel/objects/xmutant.h" +#include "xenia/kernel/objects/xsemaphore.h" namespace xe { namespace kernel { diff --git a/src/xenia/kernel/xobject.h b/src/xenia/kernel/xobject.h index 021cc3e66..86e43a423 100644 --- a/src/xenia/kernel/xobject.h +++ b/src/xenia/kernel/xobject.h @@ -12,9 +12,9 @@ #include -#include +#include "xenia/kernel/kernel_state.h" -#include +#include "xenia/xbox.h" namespace xe { namespace kernel { diff --git a/src/xenia/logging.h b/src/xenia/logging.h index ebf988513..0787fa07a 100644 --- a/src/xenia/logging.h +++ b/src/xenia/logging.h @@ -12,7 +12,7 @@ #include -#include +#include "poly/logging.h" #define XE_OPTION_ENABLE_LOGGING 1 #define XE_OPTION_LOG_ERROR 1 diff --git a/src/xenia/memory.cc b/src/xenia/memory.cc index f1da724af..03beb85a2 100644 --- a/src/xenia/memory.cc +++ b/src/xenia/memory.cc @@ -7,19 +7,19 @@ ****************************************************************************** */ -#include +#include "xenia/memory.h" #include #include #include -#include -#include +#include "poly/math.h" +#include "xenia/cpu/mmio_handler.h" using namespace xe; // TODO(benvanik): move xbox.h out -#include +#include "xenia/xbox.h" #if !XE_PLATFORM_WIN32 #include @@ -38,7 +38,7 @@ using namespace xe; #if XE_DEBUG #define FOOTERS 0 #endif // XE_DEBUG -#include +#include "third_party/dlmalloc/malloc.c.h" DEFINE_bool(log_heap, false, "Log heap structure on alloc/free."); DEFINE_uint64( diff --git a/src/xenia/memory.h b/src/xenia/memory.h index 8bc741d77..868b4f293 100644 --- a/src/xenia/memory.h +++ b/src/xenia/memory.h @@ -12,10 +12,10 @@ #include -#include +#include "alloy/memory.h" -#include -#include +#include "xenia/common.h" +#include "xenia/cpu/mmio_handler.h" typedef struct xe_ppc_state xe_ppc_state_t; diff --git a/src/xenia/profiling.cc b/src/xenia/profiling.cc index f60a2a6ce..3b93c7478 100644 --- a/src/xenia/profiling.cc +++ b/src/xenia/profiling.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include +#include "xenia/logging.h" #define MICROPROFILE_ENABLED 1 #define MICROPROFILEUI_ENABLED 1 @@ -25,7 +25,7 @@ #include #include -#include +#include "xenia/profiling.h" namespace xe { diff --git a/src/xenia/profiling.h b/src/xenia/profiling.h index 2428c78d3..6ec644c5c 100644 --- a/src/xenia/profiling.h +++ b/src/xenia/profiling.h @@ -12,7 +12,7 @@ #include -#include +#include "poly/string.h" #define XE_OPTION_PROFILING 1 #if XE_LIKE_WIN32 diff --git a/src/xenia/ui/main_window.cc b/src/xenia/ui/main_window.cc index 059d5d9f7..52d0e19ac 100644 --- a/src/xenia/ui/main_window.cc +++ b/src/xenia/ui/main_window.cc @@ -7,11 +7,11 @@ ****************************************************************************** */ -#include +#include "xenia/ui/main_window.h" -#include -#include -#include +#include "poly/logging.h" +#include "poly/threading.h" +#include "xenia/emulator.h" namespace xe { namespace ui { diff --git a/src/xenia/ui/main_window.h b/src/xenia/ui/main_window.h index 8c83015e4..093731a95 100644 --- a/src/xenia/ui/main_window.h +++ b/src/xenia/ui/main_window.h @@ -10,12 +10,12 @@ #ifndef XENIA_UI_MAIN_WINDOW_H_ #define XENIA_UI_MAIN_WINDOW_H_ -#include -#include +#include "poly/ui/window.h" +#include "xenia/xbox.h" // TODO(benvanik): only on windows. -#include -#include +#include "poly/ui/win32/win32_loop.h" +#include "poly/ui/win32/win32_window.h" namespace xe { class Emulator; diff --git a/src/xenia/xbox.h b/src/xenia/xbox.h index 170f3e4d8..89cc78326 100644 --- a/src/xenia/xbox.h +++ b/src/xenia/xbox.h @@ -10,8 +10,8 @@ #ifndef XENIA_XBOX_H_ #define XENIA_XBOX_H_ -#include -#include +#include "poly/memory.h" +#include "xenia/common.h" namespace xe { diff --git a/src/xenia/xenia_main.cc b/src/xenia/xenia_main.cc index 165607bcc..4803c07b0 100644 --- a/src/xenia/xenia_main.cc +++ b/src/xenia/xenia_main.cc @@ -8,10 +8,10 @@ */ #include -#include -#include -#include -#include +#include "poly/main.h" +#include "xenia/emulator.h" +#include "xenia/kernel/kernel.h" +#include "xenia/ui/main_window.h" DEFINE_string(target, "", "Specifies the target .xex or .iso to execute.");