diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6f478101..7c881cd2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -80,29 +80,29 @@ add_library(dynarmic frontend/decoder/matcher.h frontend/imm.cpp frontend/imm.h - frontend/ir/basic_block.cpp - frontend/ir/basic_block.h - frontend/ir/cond.h - frontend/ir/ir_emitter.cpp - frontend/ir/ir_emitter.h - frontend/ir/location_descriptor.cpp - frontend/ir/location_descriptor.h - frontend/ir/microinstruction.cpp - frontend/ir/microinstruction.h - frontend/ir/opcodes.cpp - frontend/ir/opcodes.h - frontend/ir/opcodes.inc - frontend/ir/terminal.h - frontend/ir/type.cpp - frontend/ir/type.h - frontend/ir/value.cpp - frontend/ir/value.h - ir_opt/constant_propagation_pass.cpp - ir_opt/dead_code_elimination_pass.cpp - ir_opt/identity_removal_pass.cpp - ir_opt/ir_matcher.h - ir_opt/passes.h - ir_opt/verification_pass.cpp + ir/basic_block.cpp + ir/basic_block.h + ir/cond.h + ir/ir_emitter.cpp + ir/ir_emitter.h + ir/location_descriptor.cpp + ir/location_descriptor.h + ir/microinstruction.cpp + ir/microinstruction.h + ir/opcodes.cpp + ir/opcodes.h + ir/opcodes.inc + ir/opt/constant_propagation_pass.cpp + ir/opt/dead_code_elimination_pass.cpp + ir/opt/identity_removal_pass.cpp + ir/opt/ir_matcher.h + ir/opt/passes.h + ir/opt/verification_pass.cpp + ir/terminal.h + ir/type.cpp + ir/type.h + ir/value.cpp + ir/value.h ) if ("A32" IN_LIST DYNARMIC_FRONTENDS) @@ -178,8 +178,8 @@ if ("A32" IN_LIST DYNARMIC_FRONTENDS) frontend/A32/translate/translate.h frontend/A32/translate/translate_arm.cpp frontend/A32/translate/translate_thumb.cpp - ir_opt/a32_constant_memory_reads_pass.cpp - ir_opt/a32_get_set_elimination_pass.cpp + ir/opt/a32_constant_memory_reads_pass.cpp + ir/opt/a32_get_set_elimination_pass.cpp ) endif() @@ -252,9 +252,9 @@ if ("A64" IN_LIST DYNARMIC_FRONTENDS) frontend/A64/translate/impl/system_flag_manipulation.cpp frontend/A64/translate/translate.cpp frontend/A64/translate/translate.h - ir_opt/a64_callback_config_pass.cpp - ir_opt/a64_get_set_elimination_pass.cpp - ir_opt/a64_merge_interpret_blocks.cpp + ir/opt/a64_callback_config_pass.cpp + ir/opt/a64_get_set_elimination_pass.cpp + ir/opt/a64_merge_interpret_blocks.cpp ) endif() diff --git a/src/backend/x64/a32_emit_x64.cpp b/src/backend/x64/a32_emit_x64.cpp index fd37a0a6..4e6b681f 100644 --- a/src/backend/x64/a32_emit_x64.cpp +++ b/src/backend/x64/a32_emit_x64.cpp @@ -29,9 +29,9 @@ #include "common/variant_util.h" #include "frontend/A32/location_descriptor.h" #include "frontend/A32/types.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" +#include "ir/basic_block.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" // TODO: Have ARM flags in host flags and not have them use up GPR registers unless necessary. // TODO: Actually implement that proper instruction selector you've always wanted to sweetheart. @@ -136,7 +136,7 @@ A32EmitX64::BlockDescriptor A32EmitX64::Emit(IR::Block& block) { A32EmitX64::EmitA32##name(ctx, inst); \ break; #define A64OPC(...) -#include "frontend/ir/opcodes.inc" +#include "ir/opcodes.inc" #undef OPCODE #undef A32OPC #undef A64OPC diff --git a/src/backend/x64/a32_emit_x64.h b/src/backend/x64/a32_emit_x64.h index f9056bb8..51c9ff9e 100644 --- a/src/backend/x64/a32_emit_x64.h +++ b/src/backend/x64/a32_emit_x64.h @@ -19,7 +19,7 @@ #include "backend/x64/block_range_information.h" #include "backend/x64/emit_x64.h" #include "frontend/A32/location_descriptor.h" -#include "frontend/ir/terminal.h" +#include "ir/terminal.h" namespace Dynarmic::Backend::X64 { @@ -89,7 +89,7 @@ protected: #define OPCODE(...) #define A32OPC(name, type, ...) void EmitA32##name(A32EmitContext& ctx, IR::Inst* inst); #define A64OPC(...) -#include "frontend/ir/opcodes.inc" +#include "ir/opcodes.inc" #undef OPCODE #undef A32OPC #undef A64OPC diff --git a/src/backend/x64/a32_interface.cpp b/src/backend/x64/a32_interface.cpp index 60abb147..4a98e82d 100644 --- a/src/backend/x64/a32_interface.cpp +++ b/src/backend/x64/a32_interface.cpp @@ -24,9 +24,9 @@ #include "common/llvm_disassemble.h" #include "common/scope_exit.h" #include "frontend/A32/translate/translate.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/location_descriptor.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/location_descriptor.h" +#include "ir/opt/passes.h" namespace Dynarmic::A32 { diff --git a/src/backend/x64/a64_emit_x64.cpp b/src/backend/x64/a64_emit_x64.cpp index 60e7fe65..26670b2c 100644 --- a/src/backend/x64/a64_emit_x64.cpp +++ b/src/backend/x64/a64_emit_x64.cpp @@ -25,10 +25,10 @@ #include "common/scope_exit.h" #include "frontend/A64/location_descriptor.h" #include "frontend/A64/types.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/cond.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" +#include "ir/basic_block.h" +#include "ir/cond.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" // TODO: Have ARM flags in host flags and not have them use up GPR registers unless necessary. // TODO: Actually implement that proper instruction selector you've always wanted to sweetheart. @@ -102,7 +102,7 @@ A64EmitX64::BlockDescriptor A64EmitX64::Emit(IR::Block& block) { case IR::Opcode::A64##name: \ A64EmitX64::EmitA64##name(ctx, inst); \ break; -#include "frontend/ir/opcodes.inc" +#include "ir/opcodes.inc" #undef OPCODE #undef A32OPC #undef A64OPC diff --git a/src/backend/x64/a64_emit_x64.h b/src/backend/x64/a64_emit_x64.h index f7db0243..cef7ca14 100644 --- a/src/backend/x64/a64_emit_x64.h +++ b/src/backend/x64/a64_emit_x64.h @@ -16,7 +16,7 @@ #include "backend/x64/block_range_information.h" #include "backend/x64/emit_x64.h" #include "frontend/A64/location_descriptor.h" -#include "frontend/ir/terminal.h" +#include "ir/terminal.h" namespace Dynarmic::Backend::X64 { @@ -97,7 +97,7 @@ protected: #define OPCODE(...) #define A32OPC(...) #define A64OPC(name, type, ...) void EmitA64##name(A64EmitContext& ctx, IR::Inst* inst); -#include "frontend/ir/opcodes.inc" +#include "ir/opcodes.inc" #undef OPCODE #undef A32OPC #undef A64OPC diff --git a/src/backend/x64/a64_interface.cpp b/src/backend/x64/a64_interface.cpp index 9bce1c7e..fd96a9b8 100644 --- a/src/backend/x64/a64_interface.cpp +++ b/src/backend/x64/a64_interface.cpp @@ -18,8 +18,8 @@ #include "common/llvm_disassemble.h" #include "common/scope_exit.h" #include "frontend/A64/translate/translate.h" -#include "frontend/ir/basic_block.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/opt/passes.h" namespace Dynarmic::A64 { diff --git a/src/backend/x64/abi.h b/src/backend/x64/abi.h index 069e5039..0ff65319 100644 --- a/src/backend/x64/abi.h +++ b/src/backend/x64/abi.h @@ -6,8 +6,8 @@ #include -#include "common/common_types.h" #include "backend/x64/hostloc.h" +#include "common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/block_range_information.h b/src/backend/x64/block_range_information.h index 7d2d4f28..81868b07 100644 --- a/src/backend/x64/block_range_information.h +++ b/src/backend/x64/block_range_information.h @@ -11,7 +11,7 @@ #include #include -#include "frontend/ir/location_descriptor.h" +#include "ir/location_descriptor.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64.cpp b/src/backend/x64/emit_x64.cpp index a53d1231..a71200c5 100644 --- a/src/backend/x64/emit_x64.cpp +++ b/src/backend/x64/emit_x64.cpp @@ -16,9 +16,9 @@ #include "common/common_types.h" #include "common/scope_exit.h" #include "common/variant_util.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" +#include "ir/basic_block.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" // TODO: Have ARM flags in host flags and not have them use up GPR registers unless necessary. // TODO: Actually implement that proper instruction selector you've always wanted to sweetheart. diff --git a/src/backend/x64/emit_x64.h b/src/backend/x64/emit_x64.h index c895aa73..1eae0f56 100644 --- a/src/backend/x64/emit_x64.h +++ b/src/backend/x64/emit_x64.h @@ -20,8 +20,8 @@ #include "backend/x64/reg_alloc.h" #include "common/bit_util.h" #include "common/fp/fpcr.h" -#include "frontend/ir/location_descriptor.h" -#include "frontend/ir/terminal.h" +#include "ir/location_descriptor.h" +#include "ir/terminal.h" namespace Dynarmic::IR { class Block; @@ -85,7 +85,7 @@ protected: #define OPCODE(name, type, ...) void Emit##name(EmitContext& ctx, IR::Inst* inst); #define A32OPC(...) #define A64OPC(...) -#include "frontend/ir/opcodes.inc" +#include "ir/opcodes.inc" #undef OPCODE #undef A32OPC #undef A64OPC diff --git a/src/backend/x64/emit_x64_aes.cpp b/src/backend/x64/emit_x64_aes.cpp index 431a919c..96540cf1 100644 --- a/src/backend/x64/emit_x64_aes.cpp +++ b/src/backend/x64/emit_x64_aes.cpp @@ -8,7 +8,7 @@ #include "backend/x64/emit_x64.h" #include "common/common_types.h" #include "common/crypto/aes.h" -#include "frontend/ir/microinstruction.h" +#include "ir/microinstruction.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_crc32.cpp b/src/backend/x64/emit_x64_crc32.cpp index f8cf0633..f6f17249 100644 --- a/src/backend/x64/emit_x64_crc32.cpp +++ b/src/backend/x64/emit_x64_crc32.cpp @@ -9,7 +9,7 @@ #include "backend/x64/block_of_code.h" #include "backend/x64/emit_x64.h" #include "common/crypto/crc32.h" -#include "frontend/ir/microinstruction.h" +#include "ir/microinstruction.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_data_processing.cpp b/src/backend/x64/emit_x64_data_processing.cpp index 461aef38..eadbf222 100644 --- a/src/backend/x64/emit_x64_data_processing.cpp +++ b/src/backend/x64/emit_x64_data_processing.cpp @@ -10,9 +10,9 @@ #include "backend/x64/emit_x64.h" #include "common/assert.h" #include "common/common_types.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" +#include "ir/basic_block.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_floating_point.cpp b/src/backend/x64/emit_x64_floating_point.cpp index 32ed3734..e307f99a 100644 --- a/src/backend/x64/emit_x64_floating_point.cpp +++ b/src/backend/x64/emit_x64_floating_point.cpp @@ -28,8 +28,8 @@ #include "common/fp/op.h" #include "common/fp/rounding_mode.h" #include "common/lut_from_list.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/microinstruction.h" +#include "ir/basic_block.h" +#include "ir/microinstruction.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_packed.cpp b/src/backend/x64/emit_x64_packed.cpp index 68d5d6da..56e7dba0 100644 --- a/src/backend/x64/emit_x64_packed.cpp +++ b/src/backend/x64/emit_x64_packed.cpp @@ -5,8 +5,8 @@ #include "backend/x64/block_of_code.h" #include "backend/x64/emit_x64.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_saturation.cpp b/src/backend/x64/emit_x64_saturation.cpp index c9d4c275..a9732af6 100644 --- a/src/backend/x64/emit_x64_saturation.cpp +++ b/src/backend/x64/emit_x64_saturation.cpp @@ -12,9 +12,9 @@ #include "common/assert.h" #include "common/bit_util.h" #include "common/common_types.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" +#include "ir/basic_block.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_sm4.cpp b/src/backend/x64/emit_x64_sm4.cpp index af32db47..5c388401 100644 --- a/src/backend/x64/emit_x64_sm4.cpp +++ b/src/backend/x64/emit_x64_sm4.cpp @@ -6,7 +6,7 @@ #include "backend/x64/block_of_code.h" #include "backend/x64/emit_x64.h" #include "common/crypto/sm4.h" -#include "frontend/ir/microinstruction.h" +#include "ir/microinstruction.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_vector.cpp b/src/backend/x64/emit_x64_vector.cpp index 15b3326a..bc27209c 100644 --- a/src/backend/x64/emit_x64_vector.cpp +++ b/src/backend/x64/emit_x64_vector.cpp @@ -17,9 +17,9 @@ #include "common/bit_util.h" #include "common/common_types.h" #include "common/math_util.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" +#include "ir/basic_block.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_vector_floating_point.cpp b/src/backend/x64/emit_x64_vector_floating_point.cpp index a40bb79e..9041b3fb 100644 --- a/src/backend/x64/emit_x64_vector_floating_point.cpp +++ b/src/backend/x64/emit_x64_vector_floating_point.cpp @@ -28,8 +28,8 @@ #include "common/fp/op.h" #include "common/fp/util.h" #include "common/lut_from_list.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/microinstruction.h" +#include "ir/basic_block.h" +#include "ir/microinstruction.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_vector_saturation.cpp b/src/backend/x64/emit_x64_vector_saturation.cpp index 825807d4..1d042dac 100644 --- a/src/backend/x64/emit_x64_vector_saturation.cpp +++ b/src/backend/x64/emit_x64_vector_saturation.cpp @@ -6,8 +6,8 @@ #include "backend/x64/block_of_code.h" #include "backend/x64/emit_x64.h" #include "common/common_types.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/reg_alloc.h b/src/backend/x64/reg_alloc.h index 36e44e20..37347f60 100644 --- a/src/backend/x64/reg_alloc.h +++ b/src/backend/x64/reg_alloc.h @@ -17,9 +17,9 @@ #include "backend/x64/hostloc.h" #include "backend/x64/oparg.h" #include "common/common_types.h" -#include "frontend/ir/cond.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/value.h" +#include "ir/cond.h" +#include "ir/microinstruction.h" +#include "ir/value.h" namespace Dynarmic::Backend::X64 { diff --git a/src/frontend/A32/ITState.h b/src/frontend/A32/ITState.h index 4c267073..dfe3cf13 100644 --- a/src/frontend/A32/ITState.h +++ b/src/frontend/A32/ITState.h @@ -7,7 +7,7 @@ #include "common/common_types.h" #include "common/bit_util.h" -#include "frontend/ir/cond.h" +#include "ir/cond.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/ir_emitter.cpp b/src/frontend/A32/ir_emitter.cpp index 024d9e0d..a0cc3b89 100644 --- a/src/frontend/A32/ir_emitter.cpp +++ b/src/frontend/A32/ir_emitter.cpp @@ -6,7 +6,7 @@ #include "common/assert.h" #include "frontend/A32/ir_emitter.h" #include "frontend/A32/types.h" -#include "frontend/ir/opcodes.h" +#include "ir/opcodes.h" #include diff --git a/src/frontend/A32/ir_emitter.h b/src/frontend/A32/ir_emitter.h index 8d3d8df3..62f1e76b 100644 --- a/src/frontend/A32/ir_emitter.h +++ b/src/frontend/A32/ir_emitter.h @@ -9,8 +9,8 @@ #include "common/common_types.h" #include "frontend/A32/location_descriptor.h" -#include "frontend/ir/ir_emitter.h" -#include "frontend/ir/value.h" +#include "ir/ir_emitter.h" +#include "ir/value.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/location_descriptor.h b/src/frontend/A32/location_descriptor.h index 31e3ba21..ad664848 100644 --- a/src/frontend/A32/location_descriptor.h +++ b/src/frontend/A32/location_descriptor.h @@ -12,7 +12,7 @@ #include "frontend/A32/FPSCR.h" #include "frontend/A32/PSR.h" #include "frontend/A32/ITState.h" -#include "frontend/ir/location_descriptor.h" +#include "ir/location_descriptor.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/conditional_state.cpp b/src/frontend/A32/translate/conditional_state.cpp index 4d7c963a..34b801bf 100644 --- a/src/frontend/A32/translate/conditional_state.cpp +++ b/src/frontend/A32/translate/conditional_state.cpp @@ -11,7 +11,7 @@ #include "common/common_types.h" #include "frontend/A32/ir_emitter.h" #include "frontend/A32/translate/conditional_state.h" -#include "frontend/ir/cond.h" +#include "ir/cond.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/translate.cpp b/src/frontend/A32/translate/translate.cpp index e25a2cd3..a4ee7711 100644 --- a/src/frontend/A32/translate/translate.cpp +++ b/src/frontend/A32/translate/translate.cpp @@ -5,7 +5,7 @@ #include "frontend/A32/location_descriptor.h" #include "frontend/A32/translate/translate.h" -#include "frontend/ir/basic_block.h" +#include "ir/basic_block.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/translate_arm.cpp b/src/frontend/A32/translate/translate_arm.cpp index bbc0204d..df994d0b 100644 --- a/src/frontend/A32/translate/translate_arm.cpp +++ b/src/frontend/A32/translate/translate_arm.cpp @@ -14,7 +14,7 @@ #include "frontend/A32/translate/impl/translate_arm.h" #include "frontend/A32/translate/translate.h" #include "frontend/A32/types.h" -#include "frontend/ir/basic_block.h" +#include "ir/basic_block.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/types.h b/src/frontend/A32/types.h index 9437f6df..7e15ffc0 100644 --- a/src/frontend/A32/types.h +++ b/src/frontend/A32/types.h @@ -13,7 +13,7 @@ #include "common/assert.h" #include "common/common_types.h" -#include "frontend/ir/cond.h" +#include "ir/cond.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A64/ir_emitter.cpp b/src/frontend/A64/ir_emitter.cpp index a8506b64..b4d24db7 100644 --- a/src/frontend/A64/ir_emitter.cpp +++ b/src/frontend/A64/ir_emitter.cpp @@ -5,7 +5,7 @@ #include "common/assert.h" #include "frontend/A64/ir_emitter.h" -#include "frontend/ir/opcodes.h" +#include "ir/opcodes.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/ir_emitter.h b/src/frontend/A64/ir_emitter.h index b6fcf523..4f2f1cb7 100644 --- a/src/frontend/A64/ir_emitter.h +++ b/src/frontend/A64/ir_emitter.h @@ -12,8 +12,8 @@ #include "common/common_types.h" #include "frontend/A64/location_descriptor.h" #include "frontend/A64/types.h" -#include "frontend/ir/ir_emitter.h" -#include "frontend/ir/value.h" +#include "ir/ir_emitter.h" +#include "ir/value.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/location_descriptor.h b/src/frontend/A64/location_descriptor.h index 4732a71c..10a4db7c 100644 --- a/src/frontend/A64/location_descriptor.h +++ b/src/frontend/A64/location_descriptor.h @@ -12,7 +12,7 @@ #include "common/bit_util.h" #include "common/common_types.h" #include "common/fp/fpcr.h" -#include "frontend/ir/location_descriptor.h" +#include "ir/location_descriptor.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/impl.cpp b/src/frontend/A64/translate/impl/impl.cpp index b13b3b07..fa2752c1 100644 --- a/src/frontend/A64/translate/impl/impl.cpp +++ b/src/frontend/A64/translate/impl/impl.cpp @@ -4,8 +4,8 @@ */ #include "common/bit_util.h" -#include "frontend/ir/terminal.h" #include "frontend/A64/translate/impl/impl.h" +#include "ir/terminal.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/translate.cpp b/src/frontend/A64/translate/translate.cpp index 1e4059a5..c0e1951f 100644 --- a/src/frontend/A64/translate/translate.cpp +++ b/src/frontend/A64/translate/translate.cpp @@ -7,8 +7,8 @@ #include "frontend/A64/location_descriptor.h" #include "frontend/A64/translate/impl/impl.h" #include "frontend/A64/translate/translate.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/terminal.h" +#include "ir/basic_block.h" +#include "ir/terminal.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/types.h b/src/frontend/A64/types.h index c32f6007..56df914e 100644 --- a/src/frontend/A64/types.h +++ b/src/frontend/A64/types.h @@ -10,7 +10,7 @@ #include "common/assert.h" #include "common/common_types.h" -#include "frontend/ir/cond.h" +#include "ir/cond.h" namespace Dynarmic::A64 { diff --git a/src/frontend/ir/basic_block.cpp b/src/ir/basic_block.cpp similarity index 98% rename from src/frontend/ir/basic_block.cpp rename to src/ir/basic_block.cpp index b7615f52..c561345c 100644 --- a/src/frontend/ir/basic_block.cpp +++ b/src/ir/basic_block.cpp @@ -15,9 +15,9 @@ #include "common/memory_pool.h" #include "frontend/A32/types.h" #include "frontend/A64/types.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/cond.h" -#include "frontend/ir/opcodes.h" +#include "ir/basic_block.h" +#include "ir/cond.h" +#include "ir/opcodes.h" namespace Dynarmic::IR { diff --git a/src/frontend/ir/basic_block.h b/src/ir/basic_block.h similarity index 97% rename from src/frontend/ir/basic_block.h rename to src/ir/basic_block.h index ade9b15b..969093eb 100644 --- a/src/frontend/ir/basic_block.h +++ b/src/ir/basic_block.h @@ -12,10 +12,10 @@ #include "common/common_types.h" #include "common/intrusive_list.h" -#include "frontend/ir/location_descriptor.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/terminal.h" -#include "frontend/ir/value.h" +#include "ir/location_descriptor.h" +#include "ir/microinstruction.h" +#include "ir/terminal.h" +#include "ir/value.h" namespace Dynarmic::Common { class Pool; diff --git a/src/frontend/ir/cond.h b/src/ir/cond.h similarity index 100% rename from src/frontend/ir/cond.h rename to src/ir/cond.h diff --git a/src/frontend/ir/ir_emitter.cpp b/src/ir/ir_emitter.cpp similarity index 99% rename from src/frontend/ir/ir_emitter.cpp rename to src/ir/ir_emitter.cpp index 563e8487..9810ad7f 100644 --- a/src/frontend/ir/ir_emitter.cpp +++ b/src/ir/ir_emitter.cpp @@ -4,8 +4,8 @@ */ #include "common/assert.h" -#include "frontend/ir/ir_emitter.h" -#include "frontend/ir/opcodes.h" +#include "ir/ir_emitter.h" +#include "ir/opcodes.h" namespace Dynarmic::IR { diff --git a/src/frontend/ir/ir_emitter.h b/src/ir/ir_emitter.h similarity index 99% rename from src/frontend/ir/ir_emitter.h rename to src/ir/ir_emitter.h index 87e8844f..7b55c9d4 100644 --- a/src/frontend/ir/ir_emitter.h +++ b/src/ir/ir_emitter.h @@ -6,10 +6,10 @@ #pragma once #include "common/common_types.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/location_descriptor.h" -#include "frontend/ir/terminal.h" -#include "frontend/ir/value.h" +#include "ir/basic_block.h" +#include "ir/location_descriptor.h" +#include "ir/terminal.h" +#include "ir/value.h" namespace Dynarmic::FP { enum class RoundingMode; diff --git a/src/frontend/ir/location_descriptor.cpp b/src/ir/location_descriptor.cpp similarity index 89% rename from src/frontend/ir/location_descriptor.cpp rename to src/ir/location_descriptor.cpp index a95c8848..ce6faaeb 100644 --- a/src/frontend/ir/location_descriptor.cpp +++ b/src/ir/location_descriptor.cpp @@ -6,7 +6,7 @@ #include #include -#include "frontend/ir/location_descriptor.h" +#include "ir/location_descriptor.h" namespace Dynarmic::IR { diff --git a/src/frontend/ir/location_descriptor.h b/src/ir/location_descriptor.h similarity index 100% rename from src/frontend/ir/location_descriptor.h rename to src/ir/location_descriptor.h diff --git a/src/frontend/ir/microinstruction.cpp b/src/ir/microinstruction.cpp similarity index 99% rename from src/frontend/ir/microinstruction.cpp rename to src/ir/microinstruction.cpp index f1f381df..12283ac3 100644 --- a/src/frontend/ir/microinstruction.cpp +++ b/src/ir/microinstruction.cpp @@ -8,9 +8,9 @@ #include #include "common/assert.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" -#include "frontend/ir/type.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" +#include "ir/type.h" namespace Dynarmic::IR { diff --git a/src/frontend/ir/microinstruction.h b/src/ir/microinstruction.h similarity index 99% rename from src/frontend/ir/microinstruction.h rename to src/ir/microinstruction.h index 83f90fe9..e712e15d 100644 --- a/src/frontend/ir/microinstruction.h +++ b/src/ir/microinstruction.h @@ -9,7 +9,7 @@ #include "common/common_types.h" #include "common/intrusive_list.h" -#include "frontend/ir/value.h" +#include "ir/value.h" namespace Dynarmic::IR { diff --git a/src/frontend/ir/opcodes.cpp b/src/ir/opcodes.cpp similarity index 96% rename from src/frontend/ir/opcodes.cpp rename to src/ir/opcodes.cpp index b2122c31..64e0c5f7 100644 --- a/src/frontend/ir/opcodes.cpp +++ b/src/ir/opcodes.cpp @@ -11,8 +11,8 @@ #include #include -#include "frontend/ir/opcodes.h" -#include "frontend/ir/type.h" +#include "ir/opcodes.h" +#include "ir/type.h" namespace Dynarmic::IR { diff --git a/src/frontend/ir/opcodes.h b/src/ir/opcodes.h similarity index 100% rename from src/frontend/ir/opcodes.h rename to src/ir/opcodes.h diff --git a/src/frontend/ir/opcodes.inc b/src/ir/opcodes.inc similarity index 100% rename from src/frontend/ir/opcodes.inc rename to src/ir/opcodes.inc diff --git a/src/ir_opt/a32_constant_memory_reads_pass.cpp b/src/ir/opt/a32_constant_memory_reads_pass.cpp similarity index 96% rename from src/ir_opt/a32_constant_memory_reads_pass.cpp rename to src/ir/opt/a32_constant_memory_reads_pass.cpp index 0d21c4e7..9ffb07e9 100644 --- a/src/ir_opt/a32_constant_memory_reads_pass.cpp +++ b/src/ir/opt/a32_constant_memory_reads_pass.cpp @@ -5,9 +5,9 @@ #include -#include "frontend/ir/basic_block.h" -#include "frontend/ir/opcodes.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/opcodes.h" +#include "ir/opt/passes.h" namespace Dynarmic::Optimization { diff --git a/src/ir_opt/a32_get_set_elimination_pass.cpp b/src/ir/opt/a32_get_set_elimination_pass.cpp similarity index 98% rename from src/ir_opt/a32_get_set_elimination_pass.cpp rename to src/ir/opt/a32_get_set_elimination_pass.cpp index aa875cc4..bc3e7948 100644 --- a/src/ir_opt/a32_get_set_elimination_pass.cpp +++ b/src/ir/opt/a32_get_set_elimination_pass.cpp @@ -8,10 +8,10 @@ #include "common/assert.h" #include "common/common_types.h" #include "frontend/A32/types.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/opcodes.h" -#include "frontend/ir/value.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/opcodes.h" +#include "ir/opt/passes.h" +#include "ir/value.h" namespace Dynarmic::Optimization { diff --git a/src/ir_opt/a64_callback_config_pass.cpp b/src/ir/opt/a64_callback_config_pass.cpp similarity index 91% rename from src/ir_opt/a64_callback_config_pass.cpp rename to src/ir/opt/a64_callback_config_pass.cpp index d2470332..7a92e33c 100644 --- a/src/ir_opt/a64_callback_config_pass.cpp +++ b/src/ir/opt/a64_callback_config_pass.cpp @@ -6,10 +6,10 @@ #include #include "frontend/A64/ir_emitter.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" +#include "ir/opt/passes.h" namespace Dynarmic::Optimization { diff --git a/src/ir_opt/a64_get_set_elimination_pass.cpp b/src/ir/opt/a64_get_set_elimination_pass.cpp similarity index 97% rename from src/ir_opt/a64_get_set_elimination_pass.cpp rename to src/ir/opt/a64_get_set_elimination_pass.cpp index fc7db371..6b549ede 100644 --- a/src/ir_opt/a64_get_set_elimination_pass.cpp +++ b/src/ir/opt/a64_get_set_elimination_pass.cpp @@ -7,10 +7,10 @@ #include "common/common_types.h" #include "frontend/A64/types.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/opcodes.h" -#include "frontend/ir/value.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/opcodes.h" +#include "ir/opt/passes.h" +#include "ir/value.h" namespace Dynarmic::Optimization { diff --git a/src/ir_opt/a64_merge_interpret_blocks.cpp b/src/ir/opt/a64_merge_interpret_blocks.cpp similarity index 95% rename from src/ir_opt/a64_merge_interpret_blocks.cpp rename to src/ir/opt/a64_merge_interpret_blocks.cpp index cff0c383..0653978e 100644 --- a/src/ir_opt/a64_merge_interpret_blocks.cpp +++ b/src/ir/opt/a64_merge_interpret_blocks.cpp @@ -9,8 +9,8 @@ #include "common/common_types.h" #include "frontend/A64/location_descriptor.h" #include "frontend/A64/translate/translate.h" -#include "frontend/ir/basic_block.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/opt/passes.h" namespace Dynarmic::Optimization { diff --git a/src/ir_opt/constant_propagation_pass.cpp b/src/ir/opt/constant_propagation_pass.cpp similarity index 99% rename from src/ir_opt/constant_propagation_pass.cpp rename to src/ir/opt/constant_propagation_pass.cpp index c726503f..81953dea 100644 --- a/src/ir_opt/constant_propagation_pass.cpp +++ b/src/ir/opt/constant_propagation_pass.cpp @@ -7,12 +7,12 @@ #include "common/assert.h" #include "common/bit_util.h" -#include "common/safe_ops.h" #include "common/common_types.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/ir_emitter.h" -#include "frontend/ir/opcodes.h" -#include "ir_opt/passes.h" +#include "common/safe_ops.h" +#include "ir/basic_block.h" +#include "ir/ir_emitter.h" +#include "ir/opcodes.h" +#include "ir/opt/passes.h" namespace Dynarmic::Optimization { diff --git a/src/ir_opt/dead_code_elimination_pass.cpp b/src/ir/opt/dead_code_elimination_pass.cpp similarity index 89% rename from src/ir_opt/dead_code_elimination_pass.cpp rename to src/ir/opt/dead_code_elimination_pass.cpp index 09208bb5..9952d470 100644 --- a/src/ir_opt/dead_code_elimination_pass.cpp +++ b/src/ir/opt/dead_code_elimination_pass.cpp @@ -4,8 +4,8 @@ */ #include "common/iterator_util.h" -#include "frontend/ir/basic_block.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/opt/passes.h" namespace Dynarmic::Optimization { diff --git a/src/ir_opt/identity_removal_pass.cpp b/src/ir/opt/identity_removal_pass.cpp similarity index 91% rename from src/ir_opt/identity_removal_pass.cpp rename to src/ir/opt/identity_removal_pass.cpp index 98c658f2..844678b2 100644 --- a/src/ir_opt/identity_removal_pass.cpp +++ b/src/ir/opt/identity_removal_pass.cpp @@ -6,9 +6,9 @@ #include #include "common/iterator_util.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/opcodes.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/opcodes.h" +#include "ir/opt/passes.h" namespace Dynarmic::Optimization { diff --git a/src/ir_opt/ir_matcher.h b/src/ir/opt/ir_matcher.h similarity index 96% rename from src/ir_opt/ir_matcher.h rename to src/ir/opt/ir_matcher.h index 82df0646..2e58fa95 100644 --- a/src/ir_opt/ir_matcher.h +++ b/src/ir/opt/ir_matcher.h @@ -16,9 +16,9 @@ #include #include -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" -#include "frontend/ir/value.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" +#include "ir/value.h" namespace Dynarmic::Optimization::IRMatcher { diff --git a/src/ir_opt/passes.h b/src/ir/opt/passes.h similarity index 100% rename from src/ir_opt/passes.h rename to src/ir/opt/passes.h diff --git a/src/ir_opt/verification_pass.cpp b/src/ir/opt/verification_pass.cpp similarity index 87% rename from src/ir_opt/verification_pass.cpp rename to src/ir/opt/verification_pass.cpp index a989d05c..87010526 100644 --- a/src/ir_opt/verification_pass.cpp +++ b/src/ir/opt/verification_pass.cpp @@ -8,11 +8,11 @@ #include "common/assert.h" #include "common/common_types.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" -#include "frontend/ir/type.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" +#include "ir/opt/passes.h" +#include "ir/type.h" namespace Dynarmic::Optimization { diff --git a/src/frontend/ir/terminal.h b/src/ir/terminal.h similarity index 98% rename from src/frontend/ir/terminal.h rename to src/ir/terminal.h index b3331f65..d7c03197 100644 --- a/src/frontend/ir/terminal.h +++ b/src/ir/terminal.h @@ -8,8 +8,8 @@ #include #include "common/common_types.h" -#include "frontend/ir/cond.h" -#include "frontend/ir/location_descriptor.h" +#include "ir/cond.h" +#include "ir/location_descriptor.h" namespace Dynarmic::IR { namespace Term { diff --git a/src/frontend/ir/type.cpp b/src/ir/type.cpp similarity index 97% rename from src/frontend/ir/type.cpp rename to src/ir/type.cpp index 106a5838..810c5514 100644 --- a/src/frontend/ir/type.cpp +++ b/src/ir/type.cpp @@ -7,7 +7,7 @@ #include #include -#include "frontend/ir/type.h" +#include "ir/type.h" namespace Dynarmic::IR { diff --git a/src/frontend/ir/type.h b/src/ir/type.h similarity index 100% rename from src/frontend/ir/type.h rename to src/ir/type.h diff --git a/src/frontend/ir/value.cpp b/src/ir/value.cpp similarity index 97% rename from src/frontend/ir/value.cpp rename to src/ir/value.cpp index ae86bd6b..82ca7d20 100644 --- a/src/frontend/ir/value.cpp +++ b/src/ir/value.cpp @@ -5,10 +5,10 @@ #include "common/assert.h" #include "common/bit_util.h" -#include "frontend/ir/microinstruction.h" -#include "frontend/ir/opcodes.h" -#include "frontend/ir/type.h" -#include "frontend/ir/value.h" +#include "ir/microinstruction.h" +#include "ir/opcodes.h" +#include "ir/type.h" +#include "ir/value.h" namespace Dynarmic::IR { diff --git a/src/frontend/ir/value.h b/src/ir/value.h similarity index 99% rename from src/frontend/ir/value.h rename to src/ir/value.h index d250648e..9342c8ab 100644 --- a/src/frontend/ir/value.h +++ b/src/ir/value.h @@ -9,7 +9,7 @@ #include "common/assert.h" #include "common/common_types.h" -#include "frontend/ir/type.h" +#include "ir/type.h" namespace Dynarmic::A32 { enum class ExtReg; diff --git a/tests/A32/fuzz_arm.cpp b/tests/A32/fuzz_arm.cpp index bb492058..89ec80bc 100644 --- a/tests/A32/fuzz_arm.cpp +++ b/tests/A32/fuzz_arm.cpp @@ -22,10 +22,10 @@ #include "frontend/A32/location_descriptor.h" #include "frontend/A32/translate/translate.h" #include "frontend/A32/types.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/location_descriptor.h" -#include "frontend/ir/opcodes.h" #include "fuzz_util.h" +#include "ir/basic_block.h" +#include "ir/location_descriptor.h" +#include "ir/opcodes.h" #include "rand_int.h" #include "testenv.h" #include "unicorn_emu/a32_unicorn.h" diff --git a/tests/A32/fuzz_thumb.cpp b/tests/A32/fuzz_thumb.cpp index 5b6b6244..49f5e6b3 100644 --- a/tests/A32/fuzz_thumb.cpp +++ b/tests/A32/fuzz_thumb.cpp @@ -23,8 +23,8 @@ #include "frontend/A32/location_descriptor.h" #include "frontend/A32/PSR.h" #include "frontend/A32/translate/translate.h" -#include "frontend/ir/basic_block.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/opt/passes.h" #include "rand_int.h" #include "testenv.h" #include "unicorn_emu/a32_unicorn.h" diff --git a/tests/A64/fuzz_with_unicorn.cpp b/tests/A64/fuzz_with_unicorn.cpp index ccafed5f..a95cc7e0 100644 --- a/tests/A64/fuzz_with_unicorn.cpp +++ b/tests/A64/fuzz_with_unicorn.cpp @@ -19,10 +19,10 @@ #include "frontend/A64/location_descriptor.h" #include "frontend/A64/translate/translate.h" #include "frontend/A64/types.h" -#include "frontend/ir/basic_block.h" -#include "frontend/ir/opcodes.h" #include "fuzz_util.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/opcodes.h" +#include "ir/opt/passes.h" #include "rand_int.h" #include "testenv.h" #include "unicorn_emu/a64_unicorn.h" diff --git a/tests/decoder_tests.cpp b/tests/decoder_tests.cpp index afc4ebae..4aea1497 100644 --- a/tests/decoder_tests.cpp +++ b/tests/decoder_tests.cpp @@ -13,7 +13,7 @@ #include "common/assert.h" #include "frontend/A32/decoder/asimd.h" #include "frontend/A32/translate/impl/translate_arm.h" -#include "frontend/ir/opcodes.h" +#include "ir/opcodes.h" using namespace Dynarmic; diff --git a/tests/print_info.cpp b/tests/print_info.cpp index 48cbf587..b4681ace 100644 --- a/tests/print_info.cpp +++ b/tests/print_info.cpp @@ -27,8 +27,8 @@ #include "frontend/A64/location_descriptor.h" #include "frontend/A64/translate/impl/impl.h" #include "frontend/A64/translate/translate.h" -#include "frontend/ir/basic_block.h" -#include "ir_opt/passes.h" +#include "ir/basic_block.h" +#include "ir/opt/passes.h" #include #include