From 714216fd0e028c3507fac2499908f9fcb2945063 Mon Sep 17 00:00:00 2001 From: Merry Date: Wed, 19 May 2021 17:28:35 +0100 Subject: [PATCH] Consolidate all source files into src/ directory --- CMakeLists.txt | 2 +- README.md | 4 +- src/common/fp/op.h | 17 ------- src/{ => dynarmic}/CMakeLists.txt | 24 +++++----- .../backend/x64/a32_emit_x64.cpp | 45 +++++++++-------- src/{ => dynarmic}/backend/x64/a32_emit_x64.h | 17 ++++--- .../backend/x64/a32_interface.cpp | 35 +++++++------- .../backend/x64/a32_jitstate.cpp | 14 +++--- src/{ => dynarmic}/backend/x64/a32_jitstate.h | 2 +- .../backend/x64/a64_emit_x64.cpp | 43 ++++++++--------- src/{ => dynarmic}/backend/x64/a64_emit_x64.h | 17 ++++--- .../backend/x64/a64_interface.cpp | 24 +++++----- .../backend/x64/a64_jitstate.cpp | 6 +-- src/{ => dynarmic}/backend/x64/a64_jitstate.h | 6 +-- src/{ => dynarmic}/backend/x64/abi.cpp | 8 ++-- src/{ => dynarmic}/backend/x64/abi.h | 4 +- .../backend/x64/block_of_code.cpp | 16 +++---- .../backend/x64/block_of_code.h | 14 +++--- .../backend/x64/block_range_information.cpp | 4 +- .../backend/x64/block_range_information.h | 2 +- src/{ => dynarmic}/backend/x64/callback.cpp | 4 +- src/{ => dynarmic}/backend/x64/callback.h | 2 +- .../backend/x64/constant_pool.cpp | 6 +-- .../backend/x64/constant_pool.h | 2 +- src/{ => dynarmic}/backend/x64/devirtualize.h | 6 +-- src/{ => dynarmic}/backend/x64/emit_x64.cpp | 26 +++++----- src/{ => dynarmic}/backend/x64/emit_x64.h | 14 +++--- .../backend/x64/emit_x64_aes.cpp | 12 ++--- .../backend/x64/emit_x64_crc32.cpp | 8 ++-- .../backend/x64/emit_x64_data_processing.cpp | 14 +++--- .../backend/x64/emit_x64_floating_point.cpp | 31 ++++++------ .../backend/x64/emit_x64_packed.cpp | 8 ++-- .../backend/x64/emit_x64_saturation.cpp | 16 +++---- .../backend/x64/emit_x64_sm4.cpp | 8 ++-- .../backend/x64/emit_x64_vector.cpp | 22 ++++----- .../x64/emit_x64_vector_floating_point.cpp | 25 +++++----- .../x64/emit_x64_vector_saturation.cpp | 10 ++-- .../backend/x64/exception_handler.h | 2 +- .../backend/x64/exception_handler_generic.cpp | 2 +- .../backend/x64/exception_handler_macos.cpp | 12 ++--- .../backend/x64/exception_handler_posix.cpp | 10 ++-- .../backend/x64/exception_handler_windows.cpp | 12 ++--- .../backend/x64/exclusive_monitor.cpp | 4 +- src/{ => dynarmic}/backend/x64/host_feature.h | 2 +- src/{ => dynarmic}/backend/x64/hostloc.cpp | 6 +-- src/{ => dynarmic}/backend/x64/hostloc.h | 4 +- .../backend/x64/jitstate_info.h | 0 src/{ => dynarmic}/backend/x64/nzcv_util.h | 4 +- src/{ => dynarmic}/backend/x64/oparg.h | 2 +- src/{ => dynarmic}/backend/x64/perf_map.cpp | 4 +- src/{ => dynarmic}/backend/x64/perf_map.h | 2 +- src/{ => dynarmic}/backend/x64/reg_alloc.cpp | 8 ++-- src/{ => dynarmic}/backend/x64/reg_alloc.h | 14 +++--- src/{ => dynarmic}/backend/x64/stack_layout.h | 2 +- src/{ => dynarmic}/common/assert.cpp | 2 +- src/{ => dynarmic}/common/assert.h | 2 +- src/{ => dynarmic}/common/bit_util.h | 4 +- src/{ => dynarmic}/common/cast_util.h | 0 src/{ => dynarmic}/common/common_types.h | 0 src/{ => dynarmic}/common/crypto/aes.cpp | 4 +- src/{ => dynarmic}/common/crypto/aes.h | 2 +- src/{ => dynarmic}/common/crypto/crc32.cpp | 4 +- src/{ => dynarmic}/common/crypto/crc32.h | 2 +- src/{ => dynarmic}/common/crypto/sm4.cpp | 4 +- src/{ => dynarmic}/common/crypto/sm4.h | 2 +- src/{ => dynarmic}/common/fp/fpcr.h | 8 ++-- src/{ => dynarmic}/common/fp/fpsr.h | 4 +- src/{ => dynarmic}/common/fp/fused.cpp | 8 ++-- src/{ => dynarmic}/common/fp/fused.h | 0 src/{ => dynarmic}/common/fp/info.h | 4 +- src/{ => dynarmic}/common/fp/mantissa_util.h | 4 +- src/dynarmic/common/fp/op.h | 17 +++++++ src/{ => dynarmic}/common/fp/op/FPCompare.cpp | 10 ++-- src/{ => dynarmic}/common/fp/op/FPCompare.h | 0 src/{ => dynarmic}/common/fp/op/FPConvert.cpp | 14 +++--- src/{ => dynarmic}/common/fp/op/FPConvert.h | 0 src/{ => dynarmic}/common/fp/op/FPMulAdd.cpp | 18 +++---- src/{ => dynarmic}/common/fp/op/FPMulAdd.h | 0 src/{ => dynarmic}/common/fp/op/FPNeg.h | 2 +- .../common/fp/op/FPRSqrtEstimate.cpp | 20 ++++---- .../common/fp/op/FPRSqrtEstimate.h | 0 .../common/fp/op/FPRSqrtStepFused.cpp | 16 +++---- .../common/fp/op/FPRSqrtStepFused.h | 0 .../common/fp/op/FPRecipEstimate.cpp | 20 ++++---- .../common/fp/op/FPRecipEstimate.h | 0 .../common/fp/op/FPRecipExponent.cpp | 16 +++---- .../common/fp/op/FPRecipExponent.h | 0 .../common/fp/op/FPRecipStepFused.cpp | 16 +++---- .../common/fp/op/FPRecipStepFused.h | 0 .../common/fp/op/FPRoundInt.cpp | 26 +++++----- src/{ => dynarmic}/common/fp/op/FPRoundInt.h | 2 +- src/{ => dynarmic}/common/fp/op/FPToFixed.cpp | 22 ++++----- src/{ => dynarmic}/common/fp/op/FPToFixed.h | 2 +- .../common/fp/process_exception.cpp | 8 ++-- .../common/fp/process_exception.h | 0 src/{ => dynarmic}/common/fp/process_nan.cpp | 16 +++---- src/{ => dynarmic}/common/fp/process_nan.h | 0 src/{ => dynarmic}/common/fp/rounding_mode.h | 0 src/{ => dynarmic}/common/fp/unpacked.cpp | 14 +++--- src/{ => dynarmic}/common/fp/unpacked.h | 4 +- src/{ => dynarmic}/common/fp/util.h | 4 +- src/{ => dynarmic}/common/intrusive_list.h | 2 +- src/{ => dynarmic}/common/iterator_util.h | 0 .../common/llvm_disassemble.cpp | 6 +-- src/{ => dynarmic}/common/llvm_disassemble.h | 2 +- src/{ => dynarmic}/common/lut_from_list.h | 0 src/{ => dynarmic}/common/macro_util.h | 0 src/{ => dynarmic}/common/math_util.cpp | 2 +- src/{ => dynarmic}/common/math_util.h | 2 +- src/{ => dynarmic}/common/memory_pool.cpp | 2 +- src/{ => dynarmic}/common/memory_pool.h | 0 src/{ => dynarmic}/common/safe_ops.h | 6 +-- src/{ => dynarmic}/common/scope_exit.h | 2 +- src/{ => dynarmic}/common/string_util.h | 0 src/{ => dynarmic}/common/u128.cpp | 4 +- src/{ => dynarmic}/common/u128.h | 4 +- src/{ => dynarmic}/common/unlikely.h | 0 src/{ => dynarmic}/common/variant_util.h | 0 src/{ => dynarmic}/frontend/A32/FPSCR.h | 6 +-- src/{ => dynarmic}/frontend/A32/ITState.h | 6 +-- src/{ => dynarmic}/frontend/A32/PSR.h | 6 +-- src/{ => dynarmic}/frontend/A32/decoder/arm.h | 10 ++-- .../frontend/A32/decoder/arm.inc | 0 .../frontend/A32/decoder/asimd.h | 10 ++-- .../frontend/A32/decoder/asimd.inc | 0 .../frontend/A32/decoder/thumb16.h | 8 ++-- .../frontend/A32/decoder/thumb16.inc | 0 .../frontend/A32/decoder/thumb32.h | 8 ++-- .../frontend/A32/decoder/thumb32.inc | 0 src/{ => dynarmic}/frontend/A32/decoder/vfp.h | 8 ++-- .../frontend/A32/decoder/vfp.inc | 0 .../frontend/A32/disassembler/disassembler.h | 2 +- .../A32/disassembler/disassembler_arm.cpp | 14 +++--- .../A32/disassembler/disassembler_thumb.cpp | 12 ++--- .../frontend/A32/ir_emitter.cpp | 11 ++--- src/{ => dynarmic}/frontend/A32/ir_emitter.h | 8 ++-- .../frontend/A32/location_descriptor.cpp | 2 +- .../frontend/A32/location_descriptor.h | 10 ++-- .../A32/translate/conditional_state.cpp | 15 +++--- .../A32/translate/conditional_state.h | 2 +- .../impl/asimd_load_store_structures.cpp | 4 +- .../A32/translate/impl/asimd_misc.cpp | 6 +-- .../impl/asimd_one_reg_modified_immediate.cpp | 6 +-- .../A32/translate/impl/asimd_three_regs.cpp | 4 +- .../translate/impl/asimd_two_regs_misc.cpp | 4 +- .../translate/impl/asimd_two_regs_scalar.cpp | 6 +-- .../translate/impl/asimd_two_regs_shift.cpp | 6 +-- .../frontend/A32/translate/impl/barrier.cpp | 2 +- .../frontend/A32/translate/impl/branch.cpp | 4 +- .../A32/translate/impl/coprocessor.cpp | 2 +- .../frontend/A32/translate/impl/crc32.cpp | 2 +- .../A32/translate/impl/data_processing.cpp | 2 +- .../frontend/A32/translate/impl/divide.cpp | 2 +- .../translate/impl/exception_generating.cpp | 4 +- .../frontend/A32/translate/impl/extension.cpp | 2 +- .../frontend/A32/translate/impl/hint.cpp | 4 +- .../A32/translate/impl/load_store.cpp | 2 +- .../frontend/A32/translate/impl/misc.cpp | 4 +- .../frontend/A32/translate/impl/multiply.cpp | 2 +- .../frontend/A32/translate/impl/packing.cpp | 2 +- .../frontend/A32/translate/impl/parallel.cpp | 2 +- .../frontend/A32/translate/impl/reversal.cpp | 2 +- .../frontend/A32/translate/impl/saturated.cpp | 2 +- .../translate/impl/status_register_access.cpp | 4 +- .../A32/translate/impl/synchronization.cpp | 2 +- .../frontend/A32/translate/impl/thumb16.cpp | 4 +- .../A32/translate/impl/thumb32_branch.cpp | 2 +- .../A32/translate/impl/thumb32_control.cpp | 2 +- .../translate/impl/thumb32_coprocessor.cpp | 2 +- ...b32_data_processing_modified_immediate.cpp | 2 +- ...data_processing_plain_binary_immediate.cpp | 6 +-- .../impl/thumb32_data_processing_register.cpp | 4 +- ...umb32_data_processing_shifted_register.cpp | 2 +- .../A32/translate/impl/thumb32_load_byte.cpp | 4 +- .../translate/impl/thumb32_load_halfword.cpp | 2 +- .../impl/thumb32_load_store_dual.cpp | 4 +- .../impl/thumb32_load_store_multiple.cpp | 4 +- .../A32/translate/impl/thumb32_load_word.cpp | 2 +- .../translate/impl/thumb32_long_multiply.cpp | 2 +- .../A32/translate/impl/thumb32_misc.cpp | 2 +- .../A32/translate/impl/thumb32_multiply.cpp | 2 +- .../A32/translate/impl/thumb32_parallel.cpp | 2 +- .../impl/thumb32_store_single_data_item.cpp | 2 +- .../frontend/A32/translate/impl/translate.cpp | 7 ++- .../frontend/A32/translate/impl/translate.h | 16 +++---- .../frontend/A32/translate/impl/vfp.cpp | 2 +- .../frontend/A32/translate/translate.cpp | 6 +-- .../frontend/A32/translate/translate.h | 5 +- .../frontend/A32/translate/translate_arm.cpp | 23 +++++---- .../A32/translate/translate_thumb.cpp | 27 +++++------ src/{ => dynarmic}/frontend/A32/types.cpp | 4 +- src/{ => dynarmic}/frontend/A32/types.h | 9 ++-- src/{ => dynarmic}/frontend/A64/decoder/a64.h | 10 ++-- .../frontend/A64/decoder/a64.inc | 0 .../frontend/A64/ir_emitter.cpp | 6 +-- src/{ => dynarmic}/frontend/A64/ir_emitter.h | 13 +++-- .../frontend/A64/location_descriptor.cpp | 2 +- .../frontend/A64/location_descriptor.h | 8 ++-- .../frontend/A64/translate/impl/branch.cpp | 2 +- .../translate/impl/data_processing_addsub.cpp | 2 +- .../impl/data_processing_bitfield.cpp | 2 +- .../data_processing_conditional_compare.cpp | 2 +- .../data_processing_conditional_select.cpp | 2 +- .../translate/impl/data_processing_crc32.cpp | 2 +- .../impl/data_processing_logical.cpp | 2 +- .../impl/data_processing_multiply.cpp | 2 +- .../translate/impl/data_processing_pcrel.cpp | 2 +- .../impl/data_processing_register.cpp | 2 +- .../translate/impl/data_processing_shift.cpp | 2 +- .../translate/impl/exception_generating.cpp | 2 +- .../translate/impl/floating_point_compare.cpp | 2 +- .../floating_point_conditional_compare.cpp | 2 +- .../floating_point_conditional_select.cpp | 2 +- .../floating_point_conversion_fixed_point.cpp | 2 +- .../floating_point_conversion_integer.cpp | 4 +- ...ing_point_data_processing_one_register.cpp | 2 +- ...g_point_data_processing_three_register.cpp | 2 +- ...ing_point_data_processing_two_register.cpp | 2 +- .../frontend/A64/translate/impl/impl.cpp | 6 +-- .../frontend/A64/translate/impl/impl.h | 10 ++-- .../translate/impl/load_store_exclusive.cpp | 2 +- .../impl/load_store_load_literal.cpp | 2 +- .../impl/load_store_multiple_structures.cpp | 2 +- .../impl/load_store_no_allocate_pair.cpp | 2 +- .../impl/load_store_register_immediate.cpp | 2 +- .../impl/load_store_register_pair.cpp | 2 +- .../load_store_register_register_offset.cpp | 2 +- .../impl/load_store_register_unprivileged.cpp | 2 +- .../impl/load_store_single_structure.cpp | 2 +- .../frontend/A64/translate/impl/move_wide.cpp | 2 +- .../A64/translate/impl/simd_across_lanes.cpp | 2 +- .../frontend/A64/translate/impl/simd_aes.cpp | 2 +- .../frontend/A64/translate/impl/simd_copy.cpp | 4 +- .../impl/simd_crypto_four_register.cpp | 2 +- .../impl/simd_crypto_three_register.cpp | 2 +- .../A64/translate/impl/simd_extract.cpp | 2 +- .../impl/simd_modified_immediate.cpp | 4 +- .../A64/translate/impl/simd_permute.cpp | 2 +- .../translate/impl/simd_scalar_pairwise.cpp | 2 +- .../impl/simd_scalar_shift_by_immediate.cpp | 4 +- .../translate/impl/simd_scalar_three_same.cpp | 4 +- .../impl/simd_scalar_two_register_misc.cpp | 2 +- .../impl/simd_scalar_x_indexed_element.cpp | 2 +- .../frontend/A64/translate/impl/simd_sha.cpp | 2 +- .../A64/translate/impl/simd_sha512.cpp | 2 +- .../impl/simd_shift_by_immediate.cpp | 6 +-- .../A64/translate/impl/simd_table_lookup.cpp | 2 +- .../translate/impl/simd_three_different.cpp | 2 +- .../A64/translate/impl/simd_three_same.cpp | 2 +- .../translate/impl/simd_three_same_extra.cpp | 2 +- .../translate/impl/simd_two_register_misc.cpp | 4 +- .../impl/simd_vector_x_indexed_element.cpp | 4 +- .../frontend/A64/translate/impl/sys_dc.cpp | 2 +- .../frontend/A64/translate/impl/sys_ic.cpp | 2 +- .../frontend/A64/translate/impl/system.cpp | 2 +- .../A64/translate/impl/system_flag_format.cpp | 2 +- .../impl/system_flag_manipulation.cpp | 2 +- .../frontend/A64/translate/translate.cpp | 12 ++--- .../frontend/A64/translate/translate.h | 2 +- src/{ => dynarmic}/frontend/A64/types.cpp | 2 +- src/{ => dynarmic}/frontend/A64/types.h | 6 +-- .../frontend/decoder/decoder_detail.h | 4 +- src/{ => dynarmic}/frontend/decoder/matcher.h | 2 +- src/{ => dynarmic}/frontend/imm.cpp | 8 ++-- src/{ => dynarmic}/frontend/imm.h | 8 ++-- .../dynarmic/interface}/A32/a32.h | 2 +- .../dynarmic/interface}/A32/arch_version.h | 0 .../dynarmic/interface}/A32/config.h | 4 +- .../dynarmic/interface}/A32/context.h | 0 .../dynarmic/interface}/A32/coprocessor.h | 2 +- .../interface}/A32/coprocessor_util.h | 0 .../dynarmic/interface}/A32/disassembler.h | 0 .../dynarmic/interface}/A64/a64.h | 2 +- .../dynarmic/interface}/A64/config.h | 2 +- .../dynarmic/interface}/exclusive_monitor.h | 0 .../dynarmic/interface}/optimization_flags.h | 0 src/{ => dynarmic}/ir/basic_block.cpp | 14 +++--- src/{ => dynarmic}/ir/basic_block.h | 12 ++--- src/{ => dynarmic}/ir/cond.h | 0 src/{ => dynarmic}/ir/ir_emitter.cpp | 6 +-- src/{ => dynarmic}/ir/ir_emitter.h | 10 ++-- src/{ => dynarmic}/ir/location_descriptor.cpp | 2 +- src/{ => dynarmic}/ir/location_descriptor.h | 2 +- src/{ => dynarmic}/ir/microinstruction.cpp | 8 ++-- src/{ => dynarmic}/ir/microinstruction.h | 6 +-- src/{ => dynarmic}/ir/opcodes.cpp | 6 +-- src/{ => dynarmic}/ir/opcodes.h | 4 +- src/{ => dynarmic}/ir/opcodes.inc | 0 .../ir/opt/a32_constant_memory_reads_pass.cpp | 9 ++-- .../ir/opt/a32_get_set_elimination_pass.cpp | 14 +++--- .../ir/opt/a64_callback_config_pass.cpp | 13 +++-- .../ir/opt/a64_get_set_elimination_pass.cpp | 12 ++--- .../ir/opt/a64_merge_interpret_blocks.cpp | 12 ++--- .../ir/opt/constant_propagation_pass.cpp | 16 +++---- .../ir/opt/dead_code_elimination_pass.cpp | 6 +-- .../ir/opt/identity_removal_pass.cpp | 8 ++-- src/{ => dynarmic}/ir/opt/ir_matcher.h | 6 +-- src/{ => dynarmic}/ir/opt/passes.h | 0 .../ir/opt/verification_pass.cpp | 14 +++--- src/{ => dynarmic}/ir/terminal.h | 6 +-- src/{ => dynarmic}/ir/type.cpp | 2 +- src/{ => dynarmic}/ir/type.h | 2 +- src/{ => dynarmic}/ir/value.cpp | 12 ++--- src/{ => dynarmic}/ir/value.h | 6 +-- tests/A32/fuzz_arm.cpp | 48 +++++++++---------- tests/A32/fuzz_thumb.cpp | 27 +++++------ tests/A32/test_arm_disassembler.cpp | 2 +- tests/A32/test_arm_instructions.cpp | 6 +-- tests/A32/test_thumb_instructions.cpp | 7 ++- tests/A32/testenv.h | 7 ++- tests/A64/a64.cpp | 7 ++- tests/A64/fuzz_with_unicorn.cpp | 36 +++++++------- tests/A64/misaligned_page_table.cpp | 5 +- tests/A64/testenv.h | 7 ++- tests/A64/verify_unicorn.cpp | 6 +-- tests/decoder_tests.cpp | 10 ++-- tests/fp/FPToFixed.cpp | 12 ++--- tests/fp/FPValue.cpp | 2 +- tests/fp/mantissa_util_tests.cpp | 8 ++-- tests/fp/unpacked_tests.cpp | 10 ++-- tests/fuzz_util.cpp | 10 ++-- tests/fuzz_util.h | 2 +- tests/print_info.cpp | 35 +++++++------- tests/rsqrt_test.cpp | 8 ++-- tests/unicorn_emu/a32_unicorn.cpp | 9 ++-- tests/unicorn_emu/a32_unicorn.h | 5 +- tests/unicorn_emu/a64_unicorn.cpp | 4 +- tests/unicorn_emu/a64_unicorn.h | 4 +- 328 files changed, 1006 insertions(+), 1032 deletions(-) delete mode 100644 src/common/fp/op.h rename src/{ => dynarmic}/CMakeLists.txt (96%) rename src/{ => dynarmic}/backend/x64/a32_emit_x64.cpp (98%) rename src/{ => dynarmic}/backend/x64/a32_emit_x64.h (93%) rename src/{ => dynarmic}/backend/x64/a32_interface.cpp (92%) rename src/{ => dynarmic}/backend/x64/a32_jitstate.cpp (95%) rename src/{ => dynarmic}/backend/x64/a32_jitstate.h (98%) rename src/{ => dynarmic}/backend/x64/a64_emit_x64.cpp (98%) rename src/{ => dynarmic}/backend/x64/a64_emit_x64.h (92%) rename src/{ => dynarmic}/backend/x64/a64_interface.cpp (95%) rename src/{ => dynarmic}/backend/x64/a64_jitstate.cpp (95%) rename src/{ => dynarmic}/backend/x64/a64_jitstate.h (93%) rename src/{ => dynarmic}/backend/x64/abi.cpp (96%) rename src/{ => dynarmic}/backend/x64/abi.h (97%) rename src/{ => dynarmic}/backend/x64/block_of_code.cpp (97%) rename src/{ => dynarmic}/backend/x64/block_of_code.h (95%) rename src/{ => dynarmic}/backend/x64/block_range_information.cpp (93%) rename src/{ => dynarmic}/backend/x64/block_range_information.h (94%) rename src/{ => dynarmic}/backend/x64/callback.cpp (93%) rename src/{ => dynarmic}/backend/x64/callback.h (97%) rename src/{ => dynarmic}/backend/x64/constant_pool.cpp (89%) rename src/{ => dynarmic}/backend/x64/constant_pool.h (95%) rename src/{ => dynarmic}/backend/x64/devirtualize.h (94%) rename src/{ => dynarmic}/backend/x64/emit_x64.cpp (94%) rename src/{ => dynarmic}/backend/x64/emit_x64.h (94%) rename src/{ => dynarmic}/backend/x64/emit_x64_aes.cpp (92%) rename src/{ => dynarmic}/backend/x64/emit_x64_crc32.cpp (96%) rename src/{ => dynarmic}/backend/x64/emit_x64_data_processing.cpp (99%) rename src/{ => dynarmic}/backend/x64/emit_x64_floating_point.cpp (99%) rename src/{ => dynarmic}/backend/x64/emit_x64_packed.cpp (99%) rename src/{ => dynarmic}/backend/x64/emit_x64_saturation.cpp (96%) rename src/{ => dynarmic}/backend/x64/emit_x64_sm4.cpp (71%) rename src/{ => dynarmic}/backend/x64/emit_x64_vector.cpp (99%) rename src/{ => dynarmic}/backend/x64/emit_x64_vector_floating_point.cpp (99%) rename src/{ => dynarmic}/backend/x64/emit_x64_vector_saturation.cpp (98%) rename src/{ => dynarmic}/backend/x64/exception_handler.h (93%) rename src/{ => dynarmic}/backend/x64/exception_handler_generic.cpp (91%) rename src/{ => dynarmic}/backend/x64/exception_handler_macos.cpp (96%) rename src/{ => dynarmic}/backend/x64/exception_handler_posix.cpp (96%) rename src/{ => dynarmic}/backend/x64/exception_handler_windows.cpp (97%) rename src/{ => dynarmic}/backend/x64/exclusive_monitor.cpp (94%) rename src/{ => dynarmic}/backend/x64/host_feature.h (97%) rename src/{ => dynarmic}/backend/x64/hostloc.cpp (79%) rename src/{ => dynarmic}/backend/x64/hostloc.h (97%) rename src/{ => dynarmic}/backend/x64/jitstate_info.h (100%) rename src/{ => dynarmic}/backend/x64/nzcv_util.h (95%) rename src/{ => dynarmic}/backend/x64/oparg.h (98%) rename src/{ => dynarmic}/backend/x64/perf_map.cpp (95%) rename src/{ => dynarmic}/backend/x64/perf_map.h (93%) rename src/{ => dynarmic}/backend/x64/reg_alloc.cpp (99%) rename src/{ => dynarmic}/backend/x64/reg_alloc.h (94%) rename src/{ => dynarmic}/backend/x64/stack_layout.h (94%) rename src/{ => dynarmic}/common/assert.cpp (92%) rename src/{ => dynarmic}/common/assert.h (98%) rename src/{ => dynarmic}/common/bit_util.h (99%) rename src/{ => dynarmic}/common/cast_util.h (100%) rename src/{ => dynarmic}/common/common_types.h (100%) rename src/{ => dynarmic}/common/crypto/aes.cpp (98%) rename src/{ => dynarmic}/common/crypto/aes.h (93%) rename src/{ => dynarmic}/common/crypto/crc32.cpp (98%) rename src/{ => dynarmic}/common/crypto/crc32.h (96%) rename src/{ => dynarmic}/common/crypto/sm4.cpp (96%) rename src/{ => dynarmic}/common/crypto/sm4.h (85%) rename src/{ => dynarmic}/common/fp/fpcr.h (97%) rename src/{ => dynarmic}/common/fp/fpsr.h (97%) rename src/{ => dynarmic}/common/fp/fused.cpp (95%) rename src/{ => dynarmic}/common/fp/fused.h (100%) rename src/{ => dynarmic}/common/fp/info.h (98%) rename src/{ => dynarmic}/common/fp/mantissa_util.h (93%) create mode 100644 src/dynarmic/common/fp/op.h rename src/{ => dynarmic}/common/fp/op/FPCompare.cpp (85%) rename src/{ => dynarmic}/common/fp/op/FPCompare.h (100%) rename src/{ => dynarmic}/common/fp/op/FPConvert.cpp (91%) rename src/{ => dynarmic}/common/fp/op/FPConvert.h (100%) rename src/{ => dynarmic}/common/fp/op/FPMulAdd.cpp (86%) rename src/{ => dynarmic}/common/fp/op/FPMulAdd.h (100%) rename src/{ => dynarmic}/common/fp/op/FPNeg.h (88%) rename src/{ => dynarmic}/common/fp/op/FPRSqrtEstimate.cpp (80%) rename src/{ => dynarmic}/common/fp/op/FPRSqrtEstimate.h (100%) rename src/{ => dynarmic}/common/fp/op/FPRSqrtStepFused.cpp (82%) rename src/{ => dynarmic}/common/fp/op/FPRSqrtStepFused.h (100%) rename src/{ => dynarmic}/common/fp/op/FPRecipEstimate.cpp (87%) rename src/{ => dynarmic}/common/fp/op/FPRecipEstimate.h (100%) rename src/{ => dynarmic}/common/fp/op/FPRecipExponent.cpp (83%) rename src/{ => dynarmic}/common/fp/op/FPRecipExponent.h (100%) rename src/{ => dynarmic}/common/fp/op/FPRecipStepFused.cpp (82%) rename src/{ => dynarmic}/common/fp/op/FPRecipStepFused.h (100%) rename src/{ => dynarmic}/common/fp/op/FPRoundInt.cpp (83%) rename src/{ => dynarmic}/common/fp/op/FPRoundInt.h (89%) rename src/{ => dynarmic}/common/fp/op/FPToFixed.cpp (88%) rename src/{ => dynarmic}/common/fp/op/FPToFixed.h (89%) rename src/{ => dynarmic}/common/fp/process_exception.cpp (89%) rename src/{ => dynarmic}/common/fp/process_exception.h (100%) rename src/{ => dynarmic}/common/fp/process_nan.cpp (90%) rename src/{ => dynarmic}/common/fp/process_nan.h (100%) rename src/{ => dynarmic}/common/fp/rounding_mode.h (100%) rename src/{ => dynarmic}/common/fp/unpacked.cpp (96%) rename src/{ => dynarmic}/common/fp/unpacked.h (96%) rename src/{ => dynarmic}/common/fp/util.h (97%) rename src/{ => dynarmic}/common/intrusive_list.h (99%) rename src/{ => dynarmic}/common/iterator_util.h (100%) rename src/{ => dynarmic}/common/llvm_disassemble.cpp (96%) rename src/{ => dynarmic}/common/llvm_disassemble.h (91%) rename src/{ => dynarmic}/common/lut_from_list.h (100%) rename src/{ => dynarmic}/common/macro_util.h (100%) rename src/{ => dynarmic}/common/math_util.cpp (97%) rename src/{ => dynarmic}/common/math_util.h (96%) rename src/{ => dynarmic}/common/memory_pool.cpp (95%) rename src/{ => dynarmic}/common/memory_pool.h (100%) rename src/{ => dynarmic}/common/safe_ops.h (96%) rename src/{ => dynarmic}/common/scope_exit.h (98%) rename src/{ => dynarmic}/common/string_util.h (100%) rename src/{ => dynarmic}/common/u128.cpp (97%) rename src/{ => dynarmic}/common/u128.h (96%) rename src/{ => dynarmic}/common/unlikely.h (100%) rename src/{ => dynarmic}/common/variant_util.h (100%) rename src/{ => dynarmic}/frontend/A32/FPSCR.h (97%) rename src/{ => dynarmic}/frontend/A32/ITState.h (91%) rename src/{ => dynarmic}/frontend/A32/PSR.h (97%) rename src/{ => dynarmic}/frontend/A32/decoder/arm.h (87%) rename src/{ => dynarmic}/frontend/A32/decoder/arm.inc (100%) rename src/{ => dynarmic}/frontend/A32/decoder/asimd.h (91%) rename src/{ => dynarmic}/frontend/A32/decoder/asimd.inc (100%) rename src/{ => dynarmic}/frontend/A32/decoder/thumb16.h (85%) rename src/{ => dynarmic}/frontend/A32/decoder/thumb16.inc (100%) rename src/{ => dynarmic}/frontend/A32/decoder/thumb32.h (85%) rename src/{ => dynarmic}/frontend/A32/decoder/thumb32.inc (100%) rename src/{ => dynarmic}/frontend/A32/decoder/vfp.h (90%) rename src/{ => dynarmic}/frontend/A32/decoder/vfp.inc (100%) rename src/{ => dynarmic}/frontend/A32/disassembler/disassembler.h (87%) rename src/{ => dynarmic}/frontend/A32/disassembler/disassembler_arm.cpp (99%) rename src/{ => dynarmic}/frontend/A32/disassembler/disassembler_thumb.cpp (97%) rename src/{ => dynarmic}/frontend/A32/ir_emitter.cpp (98%) rename src/{ => dynarmic}/frontend/A32/ir_emitter.h (96%) rename src/{ => dynarmic}/frontend/A32/location_descriptor.cpp (91%) rename src/{ => dynarmic}/frontend/A32/location_descriptor.h (95%) rename src/{ => dynarmic}/frontend/A32/translate/conditional_state.cpp (88%) rename src/{ => dynarmic}/frontend/A32/translate/conditional_state.h (95%) rename src/{ => dynarmic}/frontend/A32/translate/impl/asimd_load_store_structures.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/asimd_misc.cpp (95%) rename src/{ => dynarmic}/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp (95%) rename src/{ => dynarmic}/frontend/A32/translate/impl/asimd_three_regs.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/asimd_two_regs_misc.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/asimd_two_regs_shift.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/barrier.cpp (91%) rename src/{ => dynarmic}/frontend/A32/translate/impl/branch.cpp (95%) rename src/{ => dynarmic}/frontend/A32/translate/impl/coprocessor.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/crc32.cpp (97%) rename src/{ => dynarmic}/frontend/A32/translate/impl/data_processing.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/divide.cpp (95%) rename src/{ => dynarmic}/frontend/A32/translate/impl/exception_generating.cpp (91%) rename src/{ => dynarmic}/frontend/A32/translate/impl/extension.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/hint.cpp (93%) rename src/{ => dynarmic}/frontend/A32/translate/impl/load_store.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/misc.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/multiply.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/packing.cpp (95%) rename src/{ => dynarmic}/frontend/A32/translate/impl/parallel.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/reversal.cpp (97%) rename src/{ => dynarmic}/frontend/A32/translate/impl/saturated.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/status_register_access.cpp (96%) rename src/{ => dynarmic}/frontend/A32/translate/impl/synchronization.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb16.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_branch.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_control.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_coprocessor.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_data_processing_plain_binary_immediate.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_data_processing_register.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_load_byte.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_load_halfword.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_load_store_dual.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_load_store_multiple.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_load_word.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_long_multiply.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_misc.cpp (98%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_multiply.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_parallel.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/translate.cpp (96%) rename src/{ => dynarmic}/frontend/A32/translate/impl/translate.h (99%) rename src/{ => dynarmic}/frontend/A32/translate/impl/vfp.cpp (99%) rename src/{ => dynarmic}/frontend/A32/translate/translate.cpp (88%) rename src/{ => dynarmic}/frontend/A32/translate/translate.h (95%) rename src/{ => dynarmic}/frontend/A32/translate/translate_arm.cpp (85%) rename src/{ => dynarmic}/frontend/A32/translate/translate_thumb.cpp (91%) rename src/{ => dynarmic}/frontend/A32/types.cpp (97%) rename src/{ => dynarmic}/frontend/A32/types.h (95%) rename src/{ => dynarmic}/frontend/A64/decoder/a64.h (92%) rename src/{ => dynarmic}/frontend/A64/decoder/a64.inc (100%) rename src/{ => dynarmic}/frontend/A64/ir_emitter.cpp (98%) rename src/{ => dynarmic}/frontend/A64/ir_emitter.h (93%) rename src/{ => dynarmic}/frontend/A64/location_descriptor.cpp (88%) rename src/{ => dynarmic}/frontend/A64/location_descriptor.h (95%) rename src/{ => dynarmic}/frontend/A64/translate/impl/branch.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/data_processing_addsub.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/data_processing_bitfield.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/data_processing_conditional_compare.cpp (97%) rename src/{ => dynarmic}/frontend/A64/translate/impl/data_processing_conditional_select.cpp (96%) rename src/{ => dynarmic}/frontend/A64/translate/impl/data_processing_crc32.cpp (97%) rename src/{ => dynarmic}/frontend/A64/translate/impl/data_processing_logical.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/data_processing_multiply.cpp (97%) rename src/{ => dynarmic}/frontend/A64/translate/impl/data_processing_pcrel.cpp (91%) rename src/{ => dynarmic}/frontend/A64/translate/impl/data_processing_register.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/data_processing_shift.cpp (96%) rename src/{ => dynarmic}/frontend/A64/translate/impl/exception_generating.cpp (90%) rename src/{ => dynarmic}/frontend/A64/translate/impl/floating_point_compare.cpp (95%) rename src/{ => dynarmic}/frontend/A64/translate/impl/floating_point_conditional_compare.cpp (95%) rename src/{ => dynarmic}/frontend/A64/translate/impl/floating_point_conditional_select.cpp (92%) rename src/{ => dynarmic}/frontend/A64/translate/impl/floating_point_conversion_fixed_point.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/floating_point_conversion_integer.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/floating_point_data_processing_one_register.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/floating_point_data_processing_three_register.cpp (97%) rename src/{ => dynarmic}/frontend/A64/translate/impl/floating_point_data_processing_two_register.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/impl.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/impl.h (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/load_store_exclusive.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/load_store_load_literal.cpp (96%) rename src/{ => dynarmic}/frontend/A64/translate/impl/load_store_multiple_structures.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/load_store_no_allocate_pair.cpp (93%) rename src/{ => dynarmic}/frontend/A64/translate/impl/load_store_register_immediate.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/load_store_register_pair.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/load_store_register_register_offset.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/load_store_register_unprivileged.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/load_store_single_structure.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/move_wide.cpp (96%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_across_lanes.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_aes.cpp (95%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_copy.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_crypto_four_register.cpp (96%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_crypto_three_register.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_extract.cpp (92%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_modified_immediate.cpp (97%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_permute.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_scalar_pairwise.cpp (97%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_scalar_shift_by_immediate.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_scalar_three_same.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_scalar_two_register_misc.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_scalar_x_indexed_element.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_sha.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_sha512.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_shift_by_immediate.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_table_lookup.cpp (95%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_three_different.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_three_same.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_three_same_extra.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_two_register_misc.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/simd_vector_x_indexed_element.cpp (99%) rename src/{ => dynarmic}/frontend/A64/translate/impl/sys_dc.cpp (96%) rename src/{ => dynarmic}/frontend/A64/translate/impl/sys_ic.cpp (92%) rename src/{ => dynarmic}/frontend/A64/translate/impl/system.cpp (98%) rename src/{ => dynarmic}/frontend/A64/translate/impl/system_flag_format.cpp (96%) rename src/{ => dynarmic}/frontend/A64/translate/impl/system_flag_manipulation.cpp (97%) rename src/{ => dynarmic}/frontend/A64/translate/translate.cpp (86%) rename src/{ => dynarmic}/frontend/A64/translate/translate.h (98%) rename src/{ => dynarmic}/frontend/A64/types.cpp (95%) rename src/{ => dynarmic}/frontend/A64/types.h (92%) rename src/{ => dynarmic}/frontend/decoder/decoder_detail.h (98%) rename src/{ => dynarmic}/frontend/decoder/matcher.h (98%) rename src/{ => dynarmic}/frontend/imm.cpp (94%) rename src/{ => dynarmic}/frontend/imm.h (96%) rename {include/dynarmic => src/dynarmic/interface}/A32/a32.h (98%) rename {include/dynarmic => src/dynarmic/interface}/A32/arch_version.h (100%) rename {include/dynarmic => src/dynarmic/interface}/A32/config.h (98%) rename {include/dynarmic => src/dynarmic/interface}/A32/context.h (100%) rename {include/dynarmic => src/dynarmic/interface}/A32/coprocessor.h (98%) rename {include/dynarmic => src/dynarmic/interface}/A32/coprocessor_util.h (100%) rename {include/dynarmic => src/dynarmic/interface}/A32/disassembler.h (100%) rename {include/dynarmic => src/dynarmic/interface}/A64/a64.h (98%) rename {include/dynarmic => src/dynarmic/interface}/A64/config.h (99%) rename {include/dynarmic => src/dynarmic/interface}/exclusive_monitor.h (100%) rename {include/dynarmic => src/dynarmic/interface}/optimization_flags.h (100%) rename src/{ => dynarmic}/ir/basic_block.cpp (96%) rename src/{ => dynarmic}/ir/basic_block.h (96%) rename src/{ => dynarmic}/ir/cond.h (100%) rename src/{ => dynarmic}/ir/ir_emitter.cpp (99%) rename src/{ => dynarmic}/ir/ir_emitter.h (99%) rename src/{ => dynarmic}/ir/location_descriptor.cpp (89%) rename src/{ => dynarmic}/ir/location_descriptor.h (96%) rename src/{ => dynarmic}/ir/microinstruction.cpp (99%) rename src/{ => dynarmic}/ir/microinstruction.h (98%) rename src/{ => dynarmic}/ir/opcodes.cpp (95%) rename src/{ => dynarmic}/ir/opcodes.h (93%) rename src/{ => dynarmic}/ir/opcodes.inc (100%) rename src/{ => dynarmic}/ir/opt/a32_constant_memory_reads_pass.cpp (93%) rename src/{ => dynarmic}/ir/opt/a32_get_set_elimination_pass.cpp (96%) rename src/{ => dynarmic}/ir/opt/a64_callback_config_pass.cpp (86%) rename src/{ => dynarmic}/ir/opt/a64_get_set_elimination_pass.cpp (95%) rename src/{ => dynarmic}/ir/opt/a64_merge_interpret_blocks.cpp (83%) rename src/{ => dynarmic}/ir/opt/constant_propagation_pass.cpp (98%) rename src/{ => dynarmic}/ir/opt/dead_code_elimination_pass.cpp (82%) rename src/{ => dynarmic}/ir/opt/identity_removal_pass.cpp (87%) rename src/{ => dynarmic}/ir/opt/ir_matcher.h (96%) rename src/{ => dynarmic}/ir/opt/passes.h (100%) rename src/{ => dynarmic}/ir/opt/verification_pass.cpp (81%) rename src/{ => dynarmic}/ir/terminal.h (97%) rename src/{ => dynarmic}/ir/type.cpp (97%) rename src/{ => dynarmic}/ir/type.h (96%) rename src/{ => dynarmic}/ir/value.cpp (95%) rename src/{ => dynarmic}/ir/value.h (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a98a9c4a..c62398ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,7 +140,7 @@ endif() add_subdirectory(externals) # Dynarmic project files -add_subdirectory(src) +add_subdirectory(src/dynarmic) if (DYNARMIC_TESTS) add_subdirectory(tests) endif() diff --git a/README.md b/README.md index 3202a141..ce8bc015 100644 --- a/README.md +++ b/README.md @@ -84,8 +84,8 @@ The below is a minimal example. Bring-your-own memory system. #include #include -#include -#include +#include "dynarmic/interface/A32/a32.h" +#include "dynarmic/interface/A32/config.h" using u8 = std::uint8_t; using u16 = std::uint16_t; diff --git a/src/common/fp/op.h b/src/common/fp/op.h deleted file mode 100644 index bfcdb048..00000000 --- a/src/common/fp/op.h +++ /dev/null @@ -1,17 +0,0 @@ -/* This file is part of the dynarmic project. - * Copyright (c) 2018 MerryMage - * SPDX-License-Identifier: 0BSD - */ - -#pragma once - -#include "common/fp/op/FPCompare.h" -#include "common/fp/op/FPConvert.h" -#include "common/fp/op/FPMulAdd.h" -#include "common/fp/op/FPRecipEstimate.h" -#include "common/fp/op/FPRecipExponent.h" -#include "common/fp/op/FPRecipStepFused.h" -#include "common/fp/op/FPRoundInt.h" -#include "common/fp/op/FPRSqrtEstimate.h" -#include "common/fp/op/FPRSqrtStepFused.h" -#include "common/fp/op/FPToFixed.h" diff --git a/src/CMakeLists.txt b/src/dynarmic/CMakeLists.txt similarity index 96% rename from src/CMakeLists.txt rename to src/dynarmic/CMakeLists.txt index 7bef2470..03769dad 100644 --- a/src/CMakeLists.txt +++ b/src/dynarmic/CMakeLists.txt @@ -1,14 +1,4 @@ add_library(dynarmic - ../include/dynarmic/A32/a32.h - ../include/dynarmic/A32/arch_version.h - ../include/dynarmic/A32/config.h - ../include/dynarmic/A32/coprocessor.h - ../include/dynarmic/A32/coprocessor_util.h - ../include/dynarmic/A32/disassembler.h - ../include/dynarmic/A64/a64.h - ../include/dynarmic/A64/config.h - ../include/dynarmic/exclusive_monitor.h - ../include/dynarmic/optimization_flags.h common/assert.cpp common/assert.h common/bit_util.h @@ -80,6 +70,8 @@ add_library(dynarmic frontend/decoder/matcher.h frontend/imm.cpp frontend/imm.h + interface/exclusive_monitor.h + interface/optimization_flags.h ir/basic_block.cpp ir/basic_block.h ir/cond.h @@ -107,6 +99,12 @@ add_library(dynarmic if ("A32" IN_LIST DYNARMIC_FRONTENDS) target_sources(dynarmic PRIVATE + interface/A32/a32.h + interface/A32/arch_version.h + interface/A32/config.h + interface/A32/coprocessor.h + interface/A32/coprocessor_util.h + interface/A32/disassembler.h frontend/A32/decoder/arm.h frontend/A32/decoder/arm.inc frontend/A32/decoder/asimd.h @@ -253,6 +251,8 @@ if ("A64" IN_LIST DYNARMIC_FRONTENDS) frontend/A64/translate/impl/system_flag_manipulation.cpp frontend/A64/translate/translate.cpp frontend/A64/translate/translate.h + interface/A64/a64.h + interface/A64/config.h ir/opt/a64_callback_config_pass.cpp ir/opt/a64_get_set_elimination_pass.cpp ir/opt/a64_merge_interpret_blocks.cpp @@ -360,9 +360,7 @@ endif() include(CreateDirectoryGroups) create_target_directory_groups(dynarmic) -target_include_directories(dynarmic - PUBLIC ../include - PRIVATE .) +target_include_directories(dynarmic PUBLIC ..) target_compile_options(dynarmic PRIVATE ${DYNARMIC_CXX_FLAGS}) target_link_libraries(dynarmic PRIVATE diff --git a/src/backend/x64/a32_emit_x64.cpp b/src/dynarmic/backend/x64/a32_emit_x64.cpp similarity index 98% rename from src/backend/x64/a32_emit_x64.cpp rename to src/dynarmic/backend/x64/a32_emit_x64.cpp index e0aadc5f..56d20795 100644 --- a/src/backend/x64/a32_emit_x64.cpp +++ b/src/dynarmic/backend/x64/a32_emit_x64.cpp @@ -11,28 +11,27 @@ #include #include -#include -#include - -#include "backend/x64/a32_emit_x64.h" -#include "backend/x64/a32_jitstate.h" -#include "backend/x64/abi.h" -#include "backend/x64/block_of_code.h" -#include "backend/x64/devirtualize.h" -#include "backend/x64/emit_x64.h" -#include "backend/x64/nzcv_util.h" -#include "backend/x64/perf_map.h" -#include "backend/x64/stack_layout.h" -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/common_types.h" -#include "common/scope_exit.h" -#include "common/variant_util.h" -#include "frontend/A32/location_descriptor.h" -#include "frontend/A32/types.h" -#include "ir/basic_block.h" -#include "ir/microinstruction.h" -#include "ir/opcodes.h" +#include "dynarmic/backend/x64/a32_emit_x64.h" +#include "dynarmic/backend/x64/a32_jitstate.h" +#include "dynarmic/backend/x64/abi.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/devirtualize.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/backend/x64/nzcv_util.h" +#include "dynarmic/backend/x64/perf_map.h" +#include "dynarmic/backend/x64/stack_layout.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/scope_exit.h" +#include "dynarmic/common/variant_util.h" +#include "dynarmic/frontend/A32/location_descriptor.h" +#include "dynarmic/frontend/A32/types.h" +#include "dynarmic/interface/A32/coprocessor.h" +#include "dynarmic/interface/exclusive_monitor.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/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. @@ -137,7 +136,7 @@ A32EmitX64::BlockDescriptor A32EmitX64::Emit(IR::Block& block) { A32EmitX64::EmitA32##name(ctx, inst); \ break; #define A64OPC(...) -#include "ir/opcodes.inc" +#include "dynarmic/ir/opcodes.inc" #undef OPCODE #undef A32OPC #undef A64OPC diff --git a/src/backend/x64/a32_emit_x64.h b/src/dynarmic/backend/x64/a32_emit_x64.h similarity index 93% rename from src/backend/x64/a32_emit_x64.h rename to src/dynarmic/backend/x64/a32_emit_x64.h index e6b94871..385490db 100644 --- a/src/backend/x64/a32_emit_x64.h +++ b/src/dynarmic/backend/x64/a32_emit_x64.h @@ -12,14 +12,13 @@ #include -#include -#include - -#include "backend/x64/a32_jitstate.h" -#include "backend/x64/block_range_information.h" -#include "backend/x64/emit_x64.h" -#include "frontend/A32/location_descriptor.h" -#include "ir/terminal.h" +#include "dynarmic/backend/x64/a32_jitstate.h" +#include "dynarmic/backend/x64/block_range_information.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/frontend/A32/location_descriptor.h" +#include "dynarmic/interface/A32/a32.h" +#include "dynarmic/interface/A32/config.h" +#include "dynarmic/ir/terminal.h" namespace Dynarmic::Backend::X64 { @@ -85,7 +84,7 @@ protected: #define OPCODE(...) #define A32OPC(name, type, ...) void EmitA32##name(A32EmitContext& ctx, IR::Inst* inst); #define A64OPC(...) -#include "ir/opcodes.inc" +#include "dynarmic/ir/opcodes.inc" #undef OPCODE #undef A32OPC #undef A64OPC diff --git a/src/backend/x64/a32_interface.cpp b/src/dynarmic/backend/x64/a32_interface.cpp similarity index 92% rename from src/backend/x64/a32_interface.cpp rename to src/dynarmic/backend/x64/a32_interface.cpp index e5fa3912..3e9eb4cc 100644 --- a/src/backend/x64/a32_interface.cpp +++ b/src/dynarmic/backend/x64/a32_interface.cpp @@ -9,24 +9,23 @@ #include #include -#include -#include - -#include "backend/x64/a32_emit_x64.h" -#include "backend/x64/a32_jitstate.h" -#include "backend/x64/block_of_code.h" -#include "backend/x64/callback.h" -#include "backend/x64/devirtualize.h" -#include "backend/x64/jitstate_info.h" -#include "common/assert.h" -#include "common/cast_util.h" -#include "common/common_types.h" -#include "common/llvm_disassemble.h" -#include "common/scope_exit.h" -#include "frontend/A32/translate/translate.h" -#include "ir/basic_block.h" -#include "ir/location_descriptor.h" -#include "ir/opt/passes.h" +#include "dynarmic/backend/x64/a32_emit_x64.h" +#include "dynarmic/backend/x64/a32_jitstate.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/callback.h" +#include "dynarmic/backend/x64/devirtualize.h" +#include "dynarmic/backend/x64/jitstate_info.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/cast_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/llvm_disassemble.h" +#include "dynarmic/common/scope_exit.h" +#include "dynarmic/frontend/A32/translate/translate.h" +#include "dynarmic/interface/A32/a32.h" +#include "dynarmic/interface/A32/context.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/location_descriptor.h" +#include "dynarmic/ir/opt/passes.h" namespace Dynarmic::A32 { diff --git a/src/backend/x64/a32_jitstate.cpp b/src/dynarmic/backend/x64/a32_jitstate.cpp similarity index 95% rename from src/backend/x64/a32_jitstate.cpp rename to src/dynarmic/backend/x64/a32_jitstate.cpp index fc7cc289..e98e5bd5 100644 --- a/src/backend/x64/a32_jitstate.cpp +++ b/src/dynarmic/backend/x64/a32_jitstate.cpp @@ -3,13 +3,13 @@ * SPDX-License-Identifier: 0BSD */ -#include "backend/x64/a32_jitstate.h" -#include "backend/x64/block_of_code.h" -#include "backend/x64/nzcv_util.h" -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/common_types.h" -#include "frontend/A32/location_descriptor.h" +#include "dynarmic/backend/x64/a32_jitstate.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/nzcv_util.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/A32/location_descriptor.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/a32_jitstate.h b/src/dynarmic/backend/x64/a32_jitstate.h similarity index 98% rename from src/backend/x64/a32_jitstate.h rename to src/dynarmic/backend/x64/a32_jitstate.h index 2e681614..c52b5427 100644 --- a/src/backend/x64/a32_jitstate.h +++ b/src/dynarmic/backend/x64/a32_jitstate.h @@ -9,7 +9,7 @@ #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/a64_emit_x64.cpp b/src/dynarmic/backend/x64/a64_emit_x64.cpp similarity index 98% rename from src/backend/x64/a64_emit_x64.cpp rename to src/dynarmic/backend/x64/a64_emit_x64.cpp index 385046ff..7c6fdc35 100644 --- a/src/backend/x64/a64_emit_x64.cpp +++ b/src/dynarmic/backend/x64/a64_emit_x64.cpp @@ -9,27 +9,26 @@ #include #include -#include - -#include "backend/x64/a64_emit_x64.h" -#include "backend/x64/a64_jitstate.h" -#include "backend/x64/abi.h" -#include "backend/x64/block_of_code.h" -#include "backend/x64/devirtualize.h" -#include "backend/x64/emit_x64.h" -#include "backend/x64/nzcv_util.h" -#include "backend/x64/perf_map.h" -#include "backend/x64/stack_layout.h" -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/common_types.h" -#include "common/scope_exit.h" -#include "frontend/A64/location_descriptor.h" -#include "frontend/A64/types.h" -#include "ir/basic_block.h" -#include "ir/cond.h" -#include "ir/microinstruction.h" -#include "ir/opcodes.h" +#include "dynarmic/backend/x64/a64_emit_x64.h" +#include "dynarmic/backend/x64/a64_jitstate.h" +#include "dynarmic/backend/x64/abi.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/devirtualize.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/backend/x64/nzcv_util.h" +#include "dynarmic/backend/x64/perf_map.h" +#include "dynarmic/backend/x64/stack_layout.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/scope_exit.h" +#include "dynarmic/frontend/A64/location_descriptor.h" +#include "dynarmic/frontend/A64/types.h" +#include "dynarmic/interface/exclusive_monitor.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/cond.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/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. @@ -103,7 +102,7 @@ A64EmitX64::BlockDescriptor A64EmitX64::Emit(IR::Block& block) { case IR::Opcode::A64##name: \ A64EmitX64::EmitA64##name(ctx, inst); \ break; -#include "ir/opcodes.inc" +#include "dynarmic/ir/opcodes.inc" #undef OPCODE #undef A32OPC #undef A64OPC diff --git a/src/backend/x64/a64_emit_x64.h b/src/dynarmic/backend/x64/a64_emit_x64.h similarity index 92% rename from src/backend/x64/a64_emit_x64.h rename to src/dynarmic/backend/x64/a64_emit_x64.h index ca76237b..7844d653 100644 --- a/src/backend/x64/a64_emit_x64.h +++ b/src/dynarmic/backend/x64/a64_emit_x64.h @@ -9,14 +9,13 @@ #include #include -#include -#include - -#include "backend/x64/a64_jitstate.h" -#include "backend/x64/block_range_information.h" -#include "backend/x64/emit_x64.h" -#include "frontend/A64/location_descriptor.h" -#include "ir/terminal.h" +#include "dynarmic/backend/x64/a64_jitstate.h" +#include "dynarmic/backend/x64/block_range_information.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/frontend/A64/location_descriptor.h" +#include "dynarmic/interface/A64/a64.h" +#include "dynarmic/interface/A64/config.h" +#include "dynarmic/ir/terminal.h" namespace Dynarmic::Backend::X64 { @@ -93,7 +92,7 @@ protected: #define OPCODE(...) #define A32OPC(...) #define A64OPC(name, type, ...) void EmitA64##name(A64EmitContext& ctx, IR::Inst* inst); -#include "ir/opcodes.inc" +#include "dynarmic/ir/opcodes.inc" #undef OPCODE #undef A32OPC #undef A64OPC diff --git a/src/backend/x64/a64_interface.cpp b/src/dynarmic/backend/x64/a64_interface.cpp similarity index 95% rename from src/backend/x64/a64_interface.cpp rename to src/dynarmic/backend/x64/a64_interface.cpp index 0c4b7fbd..1f80b34a 100644 --- a/src/backend/x64/a64_interface.cpp +++ b/src/dynarmic/backend/x64/a64_interface.cpp @@ -7,19 +7,19 @@ #include #include -#include -#include "backend/x64/a64_emit_x64.h" -#include "backend/x64/a64_jitstate.h" -#include "backend/x64/block_of_code.h" -#include "backend/x64/devirtualize.h" -#include "backend/x64/jitstate_info.h" -#include "common/assert.h" -#include "common/llvm_disassemble.h" -#include "common/scope_exit.h" -#include "frontend/A64/translate/translate.h" -#include "ir/basic_block.h" -#include "ir/opt/passes.h" +#include "dynarmic/backend/x64/a64_emit_x64.h" +#include "dynarmic/backend/x64/a64_jitstate.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/devirtualize.h" +#include "dynarmic/backend/x64/jitstate_info.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/llvm_disassemble.h" +#include "dynarmic/common/scope_exit.h" +#include "dynarmic/frontend/A64/translate/translate.h" +#include "dynarmic/interface/A64/a64.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/opt/passes.h" namespace Dynarmic::A64 { diff --git a/src/backend/x64/a64_jitstate.cpp b/src/dynarmic/backend/x64/a64_jitstate.cpp similarity index 95% rename from src/backend/x64/a64_jitstate.cpp rename to src/dynarmic/backend/x64/a64_jitstate.cpp index be6bef6e..74be862f 100644 --- a/src/backend/x64/a64_jitstate.cpp +++ b/src/dynarmic/backend/x64/a64_jitstate.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "backend/x64/a64_jitstate.h" -#include "common/bit_util.h" -#include "frontend/A64/location_descriptor.h" +#include "dynarmic/backend/x64/a64_jitstate.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/frontend/A64/location_descriptor.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/a64_jitstate.h b/src/dynarmic/backend/x64/a64_jitstate.h similarity index 93% rename from src/backend/x64/a64_jitstate.h rename to src/dynarmic/backend/x64/a64_jitstate.h index 0ef9e93d..4e47f180 100644 --- a/src/backend/x64/a64_jitstate.h +++ b/src/dynarmic/backend/x64/a64_jitstate.h @@ -9,9 +9,9 @@ #include -#include "backend/x64/nzcv_util.h" -#include "common/common_types.h" -#include "frontend/A64/location_descriptor.h" +#include "dynarmic/backend/x64/nzcv_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/A64/location_descriptor.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/abi.cpp b/src/dynarmic/backend/x64/abi.cpp similarity index 96% rename from src/backend/x64/abi.cpp rename to src/dynarmic/backend/x64/abi.cpp index fac068d5..0bf31654 100644 --- a/src/backend/x64/abi.cpp +++ b/src/dynarmic/backend/x64/abi.cpp @@ -8,10 +8,10 @@ #include -#include "backend/x64/abi.h" -#include "backend/x64/block_of_code.h" -#include "common/common_types.h" -#include "common/iterator_util.h" +#include "dynarmic/backend/x64/abi.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/iterator_util.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/abi.h b/src/dynarmic/backend/x64/abi.h similarity index 97% rename from src/backend/x64/abi.h rename to src/dynarmic/backend/x64/abi.h index 0ff65319..3a848d20 100644 --- a/src/backend/x64/abi.h +++ b/src/dynarmic/backend/x64/abi.h @@ -6,8 +6,8 @@ #include -#include "backend/x64/hostloc.h" -#include "common/common_types.h" +#include "dynarmic/backend/x64/hostloc.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/block_of_code.cpp b/src/dynarmic/backend/x64/block_of_code.cpp similarity index 97% rename from src/backend/x64/block_of_code.cpp rename to src/dynarmic/backend/x64/block_of_code.cpp index 1e557eeb..a981b7cb 100644 --- a/src/backend/x64/block_of_code.cpp +++ b/src/dynarmic/backend/x64/block_of_code.cpp @@ -8,14 +8,14 @@ #include -#include "backend/x64/a32_jitstate.h" -#include "backend/x64/abi.h" -#include "backend/x64/block_of_code.h" -#include "backend/x64/hostloc.h" -#include "backend/x64/perf_map.h" -#include "backend/x64/stack_layout.h" -#include "common/assert.h" -#include "common/bit_util.h" +#include "dynarmic/backend/x64/a32_jitstate.h" +#include "dynarmic/backend/x64/abi.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/hostloc.h" +#include "dynarmic/backend/x64/perf_map.h" +#include "dynarmic/backend/x64/stack_layout.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" #ifdef _WIN32 #include diff --git a/src/backend/x64/block_of_code.h b/src/dynarmic/backend/x64/block_of_code.h similarity index 95% rename from src/backend/x64/block_of_code.h rename to src/dynarmic/backend/x64/block_of_code.h index a359d2a6..8a5911f0 100644 --- a/src/backend/x64/block_of_code.h +++ b/src/dynarmic/backend/x64/block_of_code.h @@ -13,13 +13,13 @@ #include #include -#include "backend/x64/abi.h" -#include "backend/x64/callback.h" -#include "backend/x64/constant_pool.h" -#include "backend/x64/host_feature.h" -#include "backend/x64/jitstate_info.h" -#include "common/cast_util.h" -#include "common/common_types.h" +#include "dynarmic/backend/x64/abi.h" +#include "dynarmic/backend/x64/callback.h" +#include "dynarmic/backend/x64/constant_pool.h" +#include "dynarmic/backend/x64/host_feature.h" +#include "dynarmic/backend/x64/jitstate_info.h" +#include "dynarmic/common/cast_util.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/block_range_information.cpp b/src/dynarmic/backend/x64/block_range_information.cpp similarity index 93% rename from src/backend/x64/block_range_information.cpp rename to src/dynarmic/backend/x64/block_range_information.cpp index 4dab5f05..66783c6d 100644 --- a/src/backend/x64/block_range_information.cpp +++ b/src/dynarmic/backend/x64/block_range_information.cpp @@ -7,8 +7,8 @@ #include #include -#include "backend/x64/block_range_information.h" -#include "common/common_types.h" +#include "dynarmic/backend/x64/block_range_information.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/block_range_information.h b/src/dynarmic/backend/x64/block_range_information.h similarity index 94% rename from src/backend/x64/block_range_information.h rename to src/dynarmic/backend/x64/block_range_information.h index 81868b07..377ac82d 100644 --- a/src/backend/x64/block_range_information.h +++ b/src/dynarmic/backend/x64/block_range_information.h @@ -11,7 +11,7 @@ #include #include -#include "ir/location_descriptor.h" +#include "dynarmic/ir/location_descriptor.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/callback.cpp b/src/dynarmic/backend/x64/callback.cpp similarity index 93% rename from src/backend/x64/callback.cpp rename to src/dynarmic/backend/x64/callback.cpp index 31aba7b4..9a9232ec 100644 --- a/src/backend/x64/callback.cpp +++ b/src/dynarmic/backend/x64/callback.cpp @@ -3,8 +3,8 @@ * SPDX-License-Identifier: 0BSD */ -#include "backend/x64/callback.h" -#include "backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/callback.h" +#include "dynarmic/backend/x64/block_of_code.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/callback.h b/src/dynarmic/backend/x64/callback.h similarity index 97% rename from src/backend/x64/callback.h rename to src/dynarmic/backend/x64/callback.h index 6fab0fda..9ec64c83 100644 --- a/src/backend/x64/callback.h +++ b/src/dynarmic/backend/x64/callback.h @@ -10,7 +10,7 @@ #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/constant_pool.cpp b/src/dynarmic/backend/x64/constant_pool.cpp similarity index 89% rename from src/backend/x64/constant_pool.cpp rename to src/dynarmic/backend/x64/constant_pool.cpp index 8a8f512d..a48aa071 100644 --- a/src/backend/x64/constant_pool.cpp +++ b/src/dynarmic/backend/x64/constant_pool.cpp @@ -5,9 +5,9 @@ #include -#include "backend/x64/block_of_code.h" -#include "backend/x64/constant_pool.h" -#include "common/assert.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/constant_pool.h" +#include "dynarmic/common/assert.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/constant_pool.h b/src/dynarmic/backend/x64/constant_pool.h similarity index 95% rename from src/backend/x64/constant_pool.h rename to src/dynarmic/backend/x64/constant_pool.h index 25d63c53..0983bc3a 100644 --- a/src/backend/x64/constant_pool.h +++ b/src/dynarmic/backend/x64/constant_pool.h @@ -10,7 +10,7 @@ #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/devirtualize.h b/src/dynarmic/backend/x64/devirtualize.h similarity index 94% rename from src/backend/x64/devirtualize.h rename to src/dynarmic/backend/x64/devirtualize.h index ae214d1a..a2bf9e18 100644 --- a/src/backend/x64/devirtualize.h +++ b/src/dynarmic/backend/x64/devirtualize.h @@ -10,9 +10,9 @@ #include -#include "backend/x64/callback.h" -#include "common/cast_util.h" -#include "common/common_types.h" +#include "dynarmic/backend/x64/callback.h" +#include "dynarmic/common/cast_util.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic { namespace Backend::X64 { diff --git a/src/backend/x64/emit_x64.cpp b/src/dynarmic/backend/x64/emit_x64.cpp similarity index 94% rename from src/backend/x64/emit_x64.cpp rename to src/dynarmic/backend/x64/emit_x64.cpp index 0bd3c65f..e4577388 100644 --- a/src/backend/x64/emit_x64.cpp +++ b/src/dynarmic/backend/x64/emit_x64.cpp @@ -7,19 +7,19 @@ #include -#include "backend/x64/block_of_code.h" -#include "backend/x64/emit_x64.h" -#include "backend/x64/nzcv_util.h" -#include "backend/x64/perf_map.h" -#include "backend/x64/stack_layout.h" -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/common_types.h" -#include "common/scope_exit.h" -#include "common/variant_util.h" -#include "ir/basic_block.h" -#include "ir/microinstruction.h" -#include "ir/opcodes.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/backend/x64/nzcv_util.h" +#include "dynarmic/backend/x64/perf_map.h" +#include "dynarmic/backend/x64/stack_layout.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/scope_exit.h" +#include "dynarmic/common/variant_util.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/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/dynarmic/backend/x64/emit_x64.h similarity index 94% rename from src/backend/x64/emit_x64.h rename to src/dynarmic/backend/x64/emit_x64.h index 1eae0f56..12102a24 100644 --- a/src/backend/x64/emit_x64.h +++ b/src/dynarmic/backend/x64/emit_x64.h @@ -16,12 +16,12 @@ #include -#include "backend/x64/exception_handler.h" -#include "backend/x64/reg_alloc.h" -#include "common/bit_util.h" -#include "common/fp/fpcr.h" -#include "ir/location_descriptor.h" -#include "ir/terminal.h" +#include "dynarmic/backend/x64/exception_handler.h" +#include "dynarmic/backend/x64/reg_alloc.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/ir/location_descriptor.h" +#include "dynarmic/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 "ir/opcodes.inc" +#include "dynarmic/ir/opcodes.inc" #undef OPCODE #undef A32OPC #undef A64OPC diff --git a/src/backend/x64/emit_x64_aes.cpp b/src/dynarmic/backend/x64/emit_x64_aes.cpp similarity index 92% rename from src/backend/x64/emit_x64_aes.cpp rename to src/dynarmic/backend/x64/emit_x64_aes.cpp index 60f88e88..e3644ee3 100644 --- a/src/backend/x64/emit_x64_aes.cpp +++ b/src/dynarmic/backend/x64/emit_x64_aes.cpp @@ -3,12 +3,12 @@ * SPDX-License-Identifier: 0BSD */ -#include "backend/x64/abi.h" -#include "backend/x64/block_of_code.h" -#include "backend/x64/emit_x64.h" -#include "common/common_types.h" -#include "common/crypto/aes.h" -#include "ir/microinstruction.h" +#include "dynarmic/backend/x64/abi.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/crypto/aes.h" +#include "dynarmic/ir/microinstruction.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_crc32.cpp b/src/dynarmic/backend/x64/emit_x64_crc32.cpp similarity index 96% rename from src/backend/x64/emit_x64_crc32.cpp rename to src/dynarmic/backend/x64/emit_x64_crc32.cpp index 4d58ea9f..781bb91d 100644 --- a/src/backend/x64/emit_x64_crc32.cpp +++ b/src/dynarmic/backend/x64/emit_x64_crc32.cpp @@ -6,10 +6,10 @@ #include #include -#include "backend/x64/block_of_code.h" -#include "backend/x64/emit_x64.h" -#include "common/crypto/crc32.h" -#include "ir/microinstruction.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/common/crypto/crc32.h" +#include "dynarmic/ir/microinstruction.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_data_processing.cpp b/src/dynarmic/backend/x64/emit_x64_data_processing.cpp similarity index 99% rename from src/backend/x64/emit_x64_data_processing.cpp rename to src/dynarmic/backend/x64/emit_x64_data_processing.cpp index a9cf2518..9e941f32 100644 --- a/src/backend/x64/emit_x64_data_processing.cpp +++ b/src/dynarmic/backend/x64/emit_x64_data_processing.cpp @@ -6,13 +6,13 @@ #include #include -#include "backend/x64/block_of_code.h" -#include "backend/x64/emit_x64.h" -#include "common/assert.h" -#include "common/common_types.h" -#include "ir/basic_block.h" -#include "ir/microinstruction.h" -#include "ir/opcodes.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/ir/opcodes.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_floating_point.cpp b/src/dynarmic/backend/x64/emit_x64_floating_point.cpp similarity index 99% rename from src/backend/x64/emit_x64_floating_point.cpp rename to src/dynarmic/backend/x64/emit_x64_floating_point.cpp index 5e4990f5..51482357 100644 --- a/src/backend/x64/emit_x64_floating_point.cpp +++ b/src/dynarmic/backend/x64/emit_x64_floating_point.cpp @@ -14,22 +14,21 @@ #include #include -#include - -#include "backend/x64/abi.h" -#include "backend/x64/block_of_code.h" -#include "backend/x64/emit_x64.h" -#include "common/assert.h" -#include "common/common_types.h" -#include "common/cast_util.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/info.h" -#include "common/fp/op.h" -#include "common/fp/rounding_mode.h" -#include "common/lut_from_list.h" -#include "ir/basic_block.h" -#include "ir/microinstruction.h" +#include "dynarmic/backend/x64/abi.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/cast_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/info.h" +#include "dynarmic/common/fp/op.h" +#include "dynarmic/common/fp/rounding_mode.h" +#include "dynarmic/common/lut_from_list.h" +#include "dynarmic/interface/optimization_flags.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/microinstruction.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_packed.cpp b/src/dynarmic/backend/x64/emit_x64_packed.cpp similarity index 99% rename from src/backend/x64/emit_x64_packed.cpp rename to src/dynarmic/backend/x64/emit_x64_packed.cpp index ab98381c..bda2ab40 100644 --- a/src/backend/x64/emit_x64_packed.cpp +++ b/src/dynarmic/backend/x64/emit_x64_packed.cpp @@ -3,10 +3,10 @@ * SPDX-License-Identifier: 0BSD */ -#include "backend/x64/block_of_code.h" -#include "backend/x64/emit_x64.h" -#include "ir/microinstruction.h" -#include "ir/opcodes.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/ir/opcodes.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_saturation.cpp b/src/dynarmic/backend/x64/emit_x64_saturation.cpp similarity index 96% rename from src/backend/x64/emit_x64_saturation.cpp rename to src/dynarmic/backend/x64/emit_x64_saturation.cpp index a9732af6..a458b4be 100644 --- a/src/backend/x64/emit_x64_saturation.cpp +++ b/src/dynarmic/backend/x64/emit_x64_saturation.cpp @@ -7,14 +7,14 @@ #include -#include "backend/x64/block_of_code.h" -#include "backend/x64/emit_x64.h" -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/common_types.h" -#include "ir/basic_block.h" -#include "ir/microinstruction.h" -#include "ir/opcodes.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/ir/opcodes.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_sm4.cpp b/src/dynarmic/backend/x64/emit_x64_sm4.cpp similarity index 71% rename from src/backend/x64/emit_x64_sm4.cpp rename to src/dynarmic/backend/x64/emit_x64_sm4.cpp index 5c388401..0f105689 100644 --- a/src/backend/x64/emit_x64_sm4.cpp +++ b/src/dynarmic/backend/x64/emit_x64_sm4.cpp @@ -3,10 +3,10 @@ * SPDX-License-Identifier: 0BSD */ -#include "backend/x64/block_of_code.h" -#include "backend/x64/emit_x64.h" -#include "common/crypto/sm4.h" -#include "ir/microinstruction.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/common/crypto/sm4.h" +#include "dynarmic/ir/microinstruction.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_vector.cpp b/src/dynarmic/backend/x64/emit_x64_vector.cpp similarity index 99% rename from src/backend/x64/emit_x64_vector.cpp rename to src/dynarmic/backend/x64/emit_x64_vector.cpp index 856a0cfe..644d7f66 100644 --- a/src/backend/x64/emit_x64_vector.cpp +++ b/src/dynarmic/backend/x64/emit_x64_vector.cpp @@ -10,16 +10,16 @@ #include -#include "backend/x64/abi.h" -#include "backend/x64/block_of_code.h" -#include "backend/x64/emit_x64.h" -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/common_types.h" -#include "common/math_util.h" -#include "ir/basic_block.h" -#include "ir/microinstruction.h" -#include "ir/opcodes.h" +#include "dynarmic/backend/x64/abi.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/math_util.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/ir/opcodes.h" namespace Dynarmic::Backend::X64 { @@ -2094,7 +2094,7 @@ void EmitX64::EmitVectorNarrow32(EmitContext& ctx, IR::Inst* inst) { ctx.reg_alloc.DefineValue(inst, result); return; } - + const Xbyak::Xmm a = ctx.reg_alloc.UseScratchXmm(args[0]); const Xbyak::Xmm zeros = ctx.reg_alloc.ScratchXmm(); diff --git a/src/backend/x64/emit_x64_vector_floating_point.cpp b/src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp similarity index 99% rename from src/backend/x64/emit_x64_vector_floating_point.cpp rename to src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp index 961b3fcd..64075fd1 100644 --- a/src/backend/x64/emit_x64_vector_floating_point.cpp +++ b/src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp @@ -17,19 +17,18 @@ #include #include -#include - -#include "backend/x64/abi.h" -#include "backend/x64/block_of_code.h" -#include "backend/x64/emit_x64.h" -#include "common/assert.h" -#include "common/fp/fpcr.h" -#include "common/fp/info.h" -#include "common/fp/op.h" -#include "common/fp/util.h" -#include "common/lut_from_list.h" -#include "ir/basic_block.h" -#include "ir/microinstruction.h" +#include "dynarmic/backend/x64/abi.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/info.h" +#include "dynarmic/common/fp/op.h" +#include "dynarmic/common/fp/util.h" +#include "dynarmic/common/lut_from_list.h" +#include "dynarmic/interface/optimization_flags.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/microinstruction.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/emit_x64_vector_saturation.cpp b/src/dynarmic/backend/x64/emit_x64_vector_saturation.cpp similarity index 98% rename from src/backend/x64/emit_x64_vector_saturation.cpp rename to src/dynarmic/backend/x64/emit_x64_vector_saturation.cpp index 41705fc5..a3726ae0 100644 --- a/src/backend/x64/emit_x64_vector_saturation.cpp +++ b/src/dynarmic/backend/x64/emit_x64_vector_saturation.cpp @@ -3,11 +3,11 @@ * SPDX-License-Identifier: 0BSD */ -#include "backend/x64/block_of_code.h" -#include "backend/x64/emit_x64.h" -#include "common/common_types.h" -#include "ir/microinstruction.h" -#include "ir/opcodes.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/emit_x64.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/ir/opcodes.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/exception_handler.h b/src/dynarmic/backend/x64/exception_handler.h similarity index 93% rename from src/backend/x64/exception_handler.h rename to src/dynarmic/backend/x64/exception_handler.h index acbe128f..f4faf080 100644 --- a/src/backend/x64/exception_handler.h +++ b/src/dynarmic/backend/x64/exception_handler.h @@ -8,7 +8,7 @@ #include #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/exception_handler_generic.cpp b/src/dynarmic/backend/x64/exception_handler_generic.cpp similarity index 91% rename from src/backend/x64/exception_handler_generic.cpp rename to src/dynarmic/backend/x64/exception_handler_generic.cpp index 1d34f3a7..f6885080 100644 --- a/src/backend/x64/exception_handler_generic.cpp +++ b/src/dynarmic/backend/x64/exception_handler_generic.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "backend/x64/exception_handler.h" +#include "dynarmic/backend/x64/exception_handler.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/exception_handler_macos.cpp b/src/dynarmic/backend/x64/exception_handler_macos.cpp similarity index 96% rename from src/backend/x64/exception_handler_macos.cpp rename to src/dynarmic/backend/x64/exception_handler_macos.cpp index 0d645d30..8899fd1e 100644 --- a/src/backend/x64/exception_handler_macos.cpp +++ b/src/dynarmic/backend/x64/exception_handler_macos.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "backend/x64/exception_handler.h" +#include "dynarmic/backend/x64/exception_handler.h" #include #include @@ -17,13 +17,13 @@ #include -#include "backend/x64/block_of_code.h" -#include "common/assert.h" -#include "common/cast_util.h" -#include "common/common_types.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/cast_util.h" +#include "dynarmic/common/common_types.h" #define mig_external extern "C" -#include "backend/x64/mig/mach_exc_server.h" +#include "dynarmic/backend/x64/mig/mach_exc_server.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/exception_handler_posix.cpp b/src/dynarmic/backend/x64/exception_handler_posix.cpp similarity index 96% rename from src/backend/x64/exception_handler_posix.cpp rename to src/dynarmic/backend/x64/exception_handler_posix.cpp index 86b89f59..ea08703a 100644 --- a/src/backend/x64/exception_handler_posix.cpp +++ b/src/dynarmic/backend/x64/exception_handler_posix.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "backend/x64/exception_handler.h" +#include "dynarmic/backend/x64/exception_handler.h" #include #include @@ -18,10 +18,10 @@ #include #endif -#include "backend/x64/block_of_code.h" -#include "common/assert.h" -#include "common/cast_util.h" -#include "common/common_types.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/cast_util.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/exception_handler_windows.cpp b/src/dynarmic/backend/x64/exception_handler_windows.cpp similarity index 97% rename from src/backend/x64/exception_handler_windows.cpp rename to src/dynarmic/backend/x64/exception_handler_windows.cpp index 12f417cc..015ce2e4 100644 --- a/src/backend/x64/exception_handler_windows.cpp +++ b/src/dynarmic/backend/x64/exception_handler_windows.cpp @@ -9,12 +9,12 @@ #define WIN32_LEAN_AND_MEAN #include -#include "backend/x64/block_of_code.h" -#include "backend/x64/exception_handler.h" -#include "common/assert.h" -#include "common/cast_util.h" -#include "common/common_types.h" -#include "common/safe_ops.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/exception_handler.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/cast_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/safe_ops.h" using UBYTE = u8; diff --git a/src/backend/x64/exclusive_monitor.cpp b/src/dynarmic/backend/x64/exclusive_monitor.cpp similarity index 94% rename from src/backend/x64/exclusive_monitor.cpp rename to src/dynarmic/backend/x64/exclusive_monitor.cpp index c5c3ba39..5a2d8082 100644 --- a/src/backend/x64/exclusive_monitor.cpp +++ b/src/dynarmic/backend/x64/exclusive_monitor.cpp @@ -5,8 +5,8 @@ #include -#include -#include "common/assert.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/interface/exclusive_monitor.h" namespace Dynarmic { diff --git a/src/backend/x64/host_feature.h b/src/dynarmic/backend/x64/host_feature.h similarity index 97% rename from src/backend/x64/host_feature.h rename to src/dynarmic/backend/x64/host_feature.h index 6d03feb2..8d5ee9a8 100644 --- a/src/backend/x64/host_feature.h +++ b/src/dynarmic/backend/x64/host_feature.h @@ -5,7 +5,7 @@ #pragma once -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/hostloc.cpp b/src/dynarmic/backend/x64/hostloc.cpp similarity index 79% rename from src/backend/x64/hostloc.cpp rename to src/dynarmic/backend/x64/hostloc.cpp index fd214e36..846fc77b 100644 --- a/src/backend/x64/hostloc.cpp +++ b/src/dynarmic/backend/x64/hostloc.cpp @@ -5,9 +5,9 @@ #include -#include "backend/x64/abi.h" -#include "backend/x64/hostloc.h" -#include "backend/x64/stack_layout.h" +#include "dynarmic/backend/x64/abi.h" +#include "dynarmic/backend/x64/hostloc.h" +#include "dynarmic/backend/x64/stack_layout.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/hostloc.h b/src/dynarmic/backend/x64/hostloc.h similarity index 97% rename from src/backend/x64/hostloc.h rename to src/dynarmic/backend/x64/hostloc.h index 0170e626..41e962df 100644 --- a/src/backend/x64/hostloc.h +++ b/src/dynarmic/backend/x64/hostloc.h @@ -6,8 +6,8 @@ #include -#include "common/assert.h" -#include "common/common_types.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/jitstate_info.h b/src/dynarmic/backend/x64/jitstate_info.h similarity index 100% rename from src/backend/x64/jitstate_info.h rename to src/dynarmic/backend/x64/jitstate_info.h diff --git a/src/backend/x64/nzcv_util.h b/src/dynarmic/backend/x64/nzcv_util.h similarity index 95% rename from src/backend/x64/nzcv_util.h rename to src/dynarmic/backend/x64/nzcv_util.h index 3715daa0..8467aad2 100644 --- a/src/backend/x64/nzcv_util.h +++ b/src/dynarmic/backend/x64/nzcv_util.h @@ -5,8 +5,8 @@ #pragma once -#include "common/common_types.h" -#include "common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::Backend::X64::NZCV { diff --git a/src/backend/x64/oparg.h b/src/dynarmic/backend/x64/oparg.h similarity index 98% rename from src/backend/x64/oparg.h rename to src/dynarmic/backend/x64/oparg.h index 5f46b7af..88b6fdd6 100644 --- a/src/backend/x64/oparg.h +++ b/src/dynarmic/backend/x64/oparg.h @@ -7,7 +7,7 @@ #include -#include "common/assert.h" +#include "dynarmic/common/assert.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/perf_map.cpp b/src/dynarmic/backend/x64/perf_map.cpp similarity index 95% rename from src/backend/x64/perf_map.cpp rename to src/dynarmic/backend/x64/perf_map.cpp index 8b077537..56dedad7 100644 --- a/src/backend/x64/perf_map.cpp +++ b/src/dynarmic/backend/x64/perf_map.cpp @@ -6,7 +6,7 @@ #include #include -#include "backend/x64/perf_map.h" +#include "dynarmic/backend/x64/perf_map.h" #ifdef __linux__ @@ -18,7 +18,7 @@ #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/perf_map.h b/src/dynarmic/backend/x64/perf_map.h similarity index 93% rename from src/backend/x64/perf_map.h rename to src/dynarmic/backend/x64/perf_map.h index d0a660c9..4a38cf79 100644 --- a/src/backend/x64/perf_map.h +++ b/src/dynarmic/backend/x64/perf_map.h @@ -7,7 +7,7 @@ #include -#include "common/cast_util.h" +#include "dynarmic/common/cast_util.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/reg_alloc.cpp b/src/dynarmic/backend/x64/reg_alloc.cpp similarity index 99% rename from src/backend/x64/reg_alloc.cpp rename to src/dynarmic/backend/x64/reg_alloc.cpp index 07fec2ee..61c48b55 100644 --- a/src/backend/x64/reg_alloc.cpp +++ b/src/dynarmic/backend/x64/reg_alloc.cpp @@ -10,10 +10,10 @@ #include #include -#include "backend/x64/abi.h" -#include "backend/x64/reg_alloc.h" -#include "backend/x64/stack_layout.h" -#include "common/assert.h" +#include "dynarmic/backend/x64/abi.h" +#include "dynarmic/backend/x64/reg_alloc.h" +#include "dynarmic/backend/x64/stack_layout.h" +#include "dynarmic/common/assert.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/reg_alloc.h b/src/dynarmic/backend/x64/reg_alloc.h similarity index 94% rename from src/backend/x64/reg_alloc.h rename to src/dynarmic/backend/x64/reg_alloc.h index ba0bdaa1..ea4d2a4d 100644 --- a/src/backend/x64/reg_alloc.h +++ b/src/dynarmic/backend/x64/reg_alloc.h @@ -13,13 +13,13 @@ #include -#include "backend/x64/block_of_code.h" -#include "backend/x64/hostloc.h" -#include "backend/x64/oparg.h" -#include "common/common_types.h" -#include "ir/cond.h" -#include "ir/microinstruction.h" -#include "ir/value.h" +#include "dynarmic/backend/x64/block_of_code.h" +#include "dynarmic/backend/x64/hostloc.h" +#include "dynarmic/backend/x64/oparg.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/ir/cond.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/ir/value.h" namespace Dynarmic::Backend::X64 { diff --git a/src/backend/x64/stack_layout.h b/src/dynarmic/backend/x64/stack_layout.h similarity index 94% rename from src/backend/x64/stack_layout.h rename to src/dynarmic/backend/x64/stack_layout.h index 636f40b5..775803ad 100644 --- a/src/backend/x64/stack_layout.h +++ b/src/dynarmic/backend/x64/stack_layout.h @@ -7,7 +7,7 @@ #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Backend::X64 { diff --git a/src/common/assert.cpp b/src/dynarmic/common/assert.cpp similarity index 92% rename from src/common/assert.cpp rename to src/dynarmic/common/assert.cpp index 60d2b26e..d97cc0d9 100644 --- a/src/common/assert.cpp +++ b/src/dynarmic/common/assert.cpp @@ -8,7 +8,7 @@ #include -#include "common/assert.h" +#include "dynarmic/common/assert.h" namespace Dynarmic::Common { diff --git a/src/common/assert.h b/src/dynarmic/common/assert.h similarity index 98% rename from src/common/assert.h rename to src/dynarmic/common/assert.h index f78e5a29..bf241ad7 100644 --- a/src/common/assert.h +++ b/src/dynarmic/common/assert.h @@ -7,7 +7,7 @@ #include -#include "common/unlikely.h" +#include "dynarmic/common/unlikely.h" namespace Dynarmic::Common { diff --git a/src/common/bit_util.h b/src/dynarmic/common/bit_util.h similarity index 99% rename from src/common/bit_util.h rename to src/dynarmic/common/bit_util.h index 81a62b44..27c039f7 100644 --- a/src/common/bit_util.h +++ b/src/dynarmic/common/bit_util.h @@ -10,8 +10,8 @@ #include #include -#include "common/assert.h" -#include "common/common_types.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Common { diff --git a/src/common/cast_util.h b/src/dynarmic/common/cast_util.h similarity index 100% rename from src/common/cast_util.h rename to src/dynarmic/common/cast_util.h diff --git a/src/common/common_types.h b/src/dynarmic/common/common_types.h similarity index 100% rename from src/common/common_types.h rename to src/dynarmic/common/common_types.h diff --git a/src/common/crypto/aes.cpp b/src/dynarmic/common/crypto/aes.cpp similarity index 98% rename from src/common/crypto/aes.cpp rename to src/dynarmic/common/crypto/aes.cpp index 15925f10..355aa6e4 100644 --- a/src/common/crypto/aes.cpp +++ b/src/dynarmic/common/crypto/aes.cpp @@ -5,8 +5,8 @@ #include -#include "common/common_types.h" -#include "common/crypto/aes.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/crypto/aes.h" namespace Dynarmic::Common::Crypto::AES { diff --git a/src/common/crypto/aes.h b/src/dynarmic/common/crypto/aes.h similarity index 93% rename from src/common/crypto/aes.h rename to src/dynarmic/common/crypto/aes.h index 42645d27..0ab836aa 100644 --- a/src/common/crypto/aes.h +++ b/src/dynarmic/common/crypto/aes.h @@ -6,7 +6,7 @@ #pragma once #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Common::Crypto::AES { diff --git a/src/common/crypto/crc32.cpp b/src/dynarmic/common/crypto/crc32.cpp similarity index 98% rename from src/common/crypto/crc32.cpp rename to src/dynarmic/common/crypto/crc32.cpp index cfdbdcab..60ccc690 100644 --- a/src/common/crypto/crc32.cpp +++ b/src/dynarmic/common/crypto/crc32.cpp @@ -5,8 +5,8 @@ #include -#include "common/common_types.h" -#include "common/crypto/crc32.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/crypto/crc32.h" namespace Dynarmic::Common::Crypto::CRC32 { diff --git a/src/common/crypto/crc32.h b/src/dynarmic/common/crypto/crc32.h similarity index 96% rename from src/common/crypto/crc32.h rename to src/dynarmic/common/crypto/crc32.h index 108d934a..d56a9415 100644 --- a/src/common/crypto/crc32.h +++ b/src/dynarmic/common/crypto/crc32.h @@ -5,7 +5,7 @@ #pragma once -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Common::Crypto::CRC32 { diff --git a/src/common/crypto/sm4.cpp b/src/dynarmic/common/crypto/sm4.cpp similarity index 96% rename from src/common/crypto/sm4.cpp rename to src/dynarmic/common/crypto/sm4.cpp index 20055c37..6407ead7 100644 --- a/src/common/crypto/sm4.cpp +++ b/src/dynarmic/common/crypto/sm4.cpp @@ -5,8 +5,8 @@ #include -#include "common/common_types.h" -#include "common/crypto/sm4.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/crypto/sm4.h" namespace Dynarmic::Common::Crypto::SM4 { diff --git a/src/common/crypto/sm4.h b/src/dynarmic/common/crypto/sm4.h similarity index 85% rename from src/common/crypto/sm4.h rename to src/dynarmic/common/crypto/sm4.h index 17dfff1d..d764614a 100644 --- a/src/common/crypto/sm4.h +++ b/src/dynarmic/common/crypto/sm4.h @@ -5,7 +5,7 @@ #pragma once -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Common::Crypto::SM4 { diff --git a/src/common/fp/fpcr.h b/src/dynarmic/common/fp/fpcr.h similarity index 97% rename from src/common/fp/fpcr.h rename to src/dynarmic/common/fp/fpcr.h index e160102e..701e6a9e 100644 --- a/src/common/fp/fpcr.h +++ b/src/dynarmic/common/fp/fpcr.h @@ -7,10 +7,10 @@ #include -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/common_types.h" -#include "common/fp/rounding_mode.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/rounding_mode.h" namespace Dynarmic::FP { diff --git a/src/common/fp/fpsr.h b/src/dynarmic/common/fp/fpsr.h similarity index 97% rename from src/common/fp/fpsr.h rename to src/dynarmic/common/fp/fpsr.h index d1704978..4cf114a9 100644 --- a/src/common/fp/fpsr.h +++ b/src/dynarmic/common/fp/fpsr.h @@ -5,8 +5,8 @@ #pragma once -#include "common/bit_util.h" -#include "common/common_types.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::FP { diff --git a/src/common/fp/fused.cpp b/src/dynarmic/common/fp/fused.cpp similarity index 95% rename from src/common/fp/fused.cpp rename to src/dynarmic/common/fp/fused.cpp index c62ea64c..50d48606 100644 --- a/src/common/fp/fused.cpp +++ b/src/dynarmic/common/fp/fused.cpp @@ -3,10 +3,10 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/fp/fused.h" -#include "common/fp/mantissa_util.h" -#include "common/fp/unpacked.h" -#include "common/u128.h" +#include "dynarmic/common/fp/fused.h" +#include "dynarmic/common/fp/mantissa_util.h" +#include "dynarmic/common/fp/unpacked.h" +#include "dynarmic/common/u128.h" namespace Dynarmic::FP { diff --git a/src/common/fp/fused.h b/src/dynarmic/common/fp/fused.h similarity index 100% rename from src/common/fp/fused.h rename to src/dynarmic/common/fp/fused.h diff --git a/src/common/fp/info.h b/src/dynarmic/common/fp/info.h similarity index 98% rename from src/common/fp/info.h rename to src/dynarmic/common/fp/info.h index f31df3cd..da928e0f 100644 --- a/src/common/fp/info.h +++ b/src/dynarmic/common/fp/info.h @@ -5,8 +5,8 @@ #pragma once -#include "common/bit_util.h" -#include "common/common_types.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::FP { diff --git a/src/common/fp/mantissa_util.h b/src/dynarmic/common/fp/mantissa_util.h similarity index 93% rename from src/common/fp/mantissa_util.h rename to src/dynarmic/common/fp/mantissa_util.h index 9933ab69..aa3e058d 100644 --- a/src/common/fp/mantissa_util.h +++ b/src/dynarmic/common/fp/mantissa_util.h @@ -5,8 +5,8 @@ #pragma once -#include "common/bit_util.h" -#include "common/common_types.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::FP { diff --git a/src/dynarmic/common/fp/op.h b/src/dynarmic/common/fp/op.h new file mode 100644 index 00000000..e5736e44 --- /dev/null +++ b/src/dynarmic/common/fp/op.h @@ -0,0 +1,17 @@ +/* This file is part of the dynarmic project. + * Copyright (c) 2018 MerryMage + * SPDX-License-Identifier: 0BSD + */ + +#pragma once + +#include "dynarmic/common/fp/op/FPCompare.h" +#include "dynarmic/common/fp/op/FPConvert.h" +#include "dynarmic/common/fp/op/FPMulAdd.h" +#include "dynarmic/common/fp/op/FPRecipEstimate.h" +#include "dynarmic/common/fp/op/FPRecipExponent.h" +#include "dynarmic/common/fp/op/FPRecipStepFused.h" +#include "dynarmic/common/fp/op/FPRoundInt.h" +#include "dynarmic/common/fp/op/FPRSqrtEstimate.h" +#include "dynarmic/common/fp/op/FPRSqrtStepFused.h" +#include "dynarmic/common/fp/op/FPToFixed.h" diff --git a/src/common/fp/op/FPCompare.cpp b/src/dynarmic/common/fp/op/FPCompare.cpp similarity index 85% rename from src/common/fp/op/FPCompare.cpp rename to src/dynarmic/common/fp/op/FPCompare.cpp index 486b01d0..20323847 100644 --- a/src/common/fp/op/FPCompare.cpp +++ b/src/dynarmic/common/fp/op/FPCompare.cpp @@ -3,11 +3,11 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/op/FPCompare.h" -#include "common/fp/process_exception.h" -#include "common/fp/unpacked.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/op/FPCompare.h" +#include "dynarmic/common/fp/process_exception.h" +#include "dynarmic/common/fp/unpacked.h" namespace Dynarmic::FP { diff --git a/src/common/fp/op/FPCompare.h b/src/dynarmic/common/fp/op/FPCompare.h similarity index 100% rename from src/common/fp/op/FPCompare.h rename to src/dynarmic/common/fp/op/FPCompare.h diff --git a/src/common/fp/op/FPConvert.cpp b/src/dynarmic/common/fp/op/FPConvert.cpp similarity index 91% rename from src/common/fp/op/FPConvert.cpp rename to src/dynarmic/common/fp/op/FPConvert.cpp index 5bb99ebb..e3392eaf 100644 --- a/src/common/fp/op/FPConvert.cpp +++ b/src/dynarmic/common/fp/op/FPConvert.cpp @@ -3,13 +3,13 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/common_types.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/info.h" -#include "common/fp/op/FPConvert.h" -#include "common/fp/process_exception.h" -#include "common/fp/unpacked.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/info.h" +#include "dynarmic/common/fp/op/FPConvert.h" +#include "dynarmic/common/fp/process_exception.h" +#include "dynarmic/common/fp/unpacked.h" namespace Dynarmic::FP { namespace { diff --git a/src/common/fp/op/FPConvert.h b/src/dynarmic/common/fp/op/FPConvert.h similarity index 100% rename from src/common/fp/op/FPConvert.h rename to src/dynarmic/common/fp/op/FPConvert.h diff --git a/src/common/fp/op/FPMulAdd.cpp b/src/dynarmic/common/fp/op/FPMulAdd.cpp similarity index 86% rename from src/common/fp/op/FPMulAdd.cpp rename to src/dynarmic/common/fp/op/FPMulAdd.cpp index 683da688..c06e9c8d 100644 --- a/src/common/fp/op/FPMulAdd.cpp +++ b/src/dynarmic/common/fp/op/FPMulAdd.cpp @@ -3,15 +3,15 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/common_types.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/info.h" -#include "common/fp/fused.h" -#include "common/fp/op/FPMulAdd.h" -#include "common/fp/process_exception.h" -#include "common/fp/process_nan.h" -#include "common/fp/unpacked.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/info.h" +#include "dynarmic/common/fp/fused.h" +#include "dynarmic/common/fp/op/FPMulAdd.h" +#include "dynarmic/common/fp/process_exception.h" +#include "dynarmic/common/fp/process_nan.h" +#include "dynarmic/common/fp/unpacked.h" namespace Dynarmic::FP { diff --git a/src/common/fp/op/FPMulAdd.h b/src/dynarmic/common/fp/op/FPMulAdd.h similarity index 100% rename from src/common/fp/op/FPMulAdd.h rename to src/dynarmic/common/fp/op/FPMulAdd.h diff --git a/src/common/fp/op/FPNeg.h b/src/dynarmic/common/fp/op/FPNeg.h similarity index 88% rename from src/common/fp/op/FPNeg.h rename to src/dynarmic/common/fp/op/FPNeg.h index c7cabf49..c30079d2 100644 --- a/src/common/fp/op/FPNeg.h +++ b/src/dynarmic/common/fp/op/FPNeg.h @@ -5,7 +5,7 @@ #pragma once -#include "common/fp/info.h" +#include "dynarmic/common/fp/info.h" namespace Dynarmic::FP { diff --git a/src/common/fp/op/FPRSqrtEstimate.cpp b/src/dynarmic/common/fp/op/FPRSqrtEstimate.cpp similarity index 80% rename from src/common/fp/op/FPRSqrtEstimate.cpp rename to src/dynarmic/common/fp/op/FPRSqrtEstimate.cpp index 09f8ffe7..367a94c1 100644 --- a/src/common/fp/op/FPRSqrtEstimate.cpp +++ b/src/dynarmic/common/fp/op/FPRSqrtEstimate.cpp @@ -3,16 +3,16 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/common_types.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/info.h" -#include "common/fp/op/FPRSqrtEstimate.h" -#include "common/fp/process_exception.h" -#include "common/fp/process_nan.h" -#include "common/fp/unpacked.h" -#include "common/math_util.h" -#include "common/safe_ops.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/info.h" +#include "dynarmic/common/fp/op/FPRSqrtEstimate.h" +#include "dynarmic/common/fp/process_exception.h" +#include "dynarmic/common/fp/process_nan.h" +#include "dynarmic/common/fp/unpacked.h" +#include "dynarmic/common/math_util.h" +#include "dynarmic/common/safe_ops.h" namespace Dynarmic::FP { diff --git a/src/common/fp/op/FPRSqrtEstimate.h b/src/dynarmic/common/fp/op/FPRSqrtEstimate.h similarity index 100% rename from src/common/fp/op/FPRSqrtEstimate.h rename to src/dynarmic/common/fp/op/FPRSqrtEstimate.h diff --git a/src/common/fp/op/FPRSqrtStepFused.cpp b/src/dynarmic/common/fp/op/FPRSqrtStepFused.cpp similarity index 82% rename from src/common/fp/op/FPRSqrtStepFused.cpp rename to src/dynarmic/common/fp/op/FPRSqrtStepFused.cpp index 9077def9..4f7421e0 100644 --- a/src/common/fp/op/FPRSqrtStepFused.cpp +++ b/src/dynarmic/common/fp/op/FPRSqrtStepFused.cpp @@ -3,14 +3,14 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/fused.h" -#include "common/fp/info.h" -#include "common/fp/op/FPNeg.h" -#include "common/fp/op/FPRSqrtStepFused.h" -#include "common/fp/process_nan.h" -#include "common/fp/unpacked.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/fused.h" +#include "dynarmic/common/fp/info.h" +#include "dynarmic/common/fp/op/FPNeg.h" +#include "dynarmic/common/fp/op/FPRSqrtStepFused.h" +#include "dynarmic/common/fp/process_nan.h" +#include "dynarmic/common/fp/unpacked.h" namespace Dynarmic::FP { diff --git a/src/common/fp/op/FPRSqrtStepFused.h b/src/dynarmic/common/fp/op/FPRSqrtStepFused.h similarity index 100% rename from src/common/fp/op/FPRSqrtStepFused.h rename to src/dynarmic/common/fp/op/FPRSqrtStepFused.h diff --git a/src/common/fp/op/FPRecipEstimate.cpp b/src/dynarmic/common/fp/op/FPRecipEstimate.cpp similarity index 87% rename from src/common/fp/op/FPRecipEstimate.cpp rename to src/dynarmic/common/fp/op/FPRecipEstimate.cpp index e9fce62a..1a3fe8fc 100644 --- a/src/common/fp/op/FPRecipEstimate.cpp +++ b/src/dynarmic/common/fp/op/FPRecipEstimate.cpp @@ -5,16 +5,16 @@ #include -#include "common/assert.h" -#include "common/common_types.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/info.h" -#include "common/fp/op/FPRecipEstimate.h" -#include "common/fp/process_exception.h" -#include "common/fp/process_nan.h" -#include "common/fp/unpacked.h" -#include "common/math_util.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/info.h" +#include "dynarmic/common/fp/op/FPRecipEstimate.h" +#include "dynarmic/common/fp/process_exception.h" +#include "dynarmic/common/fp/process_nan.h" +#include "dynarmic/common/fp/unpacked.h" +#include "dynarmic/common/math_util.h" namespace Dynarmic::FP { diff --git a/src/common/fp/op/FPRecipEstimate.h b/src/dynarmic/common/fp/op/FPRecipEstimate.h similarity index 100% rename from src/common/fp/op/FPRecipEstimate.h rename to src/dynarmic/common/fp/op/FPRecipEstimate.h diff --git a/src/common/fp/op/FPRecipExponent.cpp b/src/dynarmic/common/fp/op/FPRecipExponent.cpp similarity index 83% rename from src/common/fp/op/FPRecipExponent.cpp rename to src/dynarmic/common/fp/op/FPRecipExponent.cpp index de47d669..a101d5c3 100644 --- a/src/common/fp/op/FPRecipExponent.cpp +++ b/src/dynarmic/common/fp/op/FPRecipExponent.cpp @@ -3,14 +3,14 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/common_types.h" -#include "common/bit_util.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/info.h" -#include "common/fp/op/FPRecipExponent.h" -#include "common/fp/process_nan.h" -#include "common/fp/unpacked.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/info.h" +#include "dynarmic/common/fp/op/FPRecipExponent.h" +#include "dynarmic/common/fp/process_nan.h" +#include "dynarmic/common/fp/unpacked.h" namespace Dynarmic::FP { namespace { diff --git a/src/common/fp/op/FPRecipExponent.h b/src/dynarmic/common/fp/op/FPRecipExponent.h similarity index 100% rename from src/common/fp/op/FPRecipExponent.h rename to src/dynarmic/common/fp/op/FPRecipExponent.h diff --git a/src/common/fp/op/FPRecipStepFused.cpp b/src/dynarmic/common/fp/op/FPRecipStepFused.cpp similarity index 82% rename from src/common/fp/op/FPRecipStepFused.cpp rename to src/dynarmic/common/fp/op/FPRecipStepFused.cpp index 0e7928c9..623e592f 100644 --- a/src/common/fp/op/FPRecipStepFused.cpp +++ b/src/dynarmic/common/fp/op/FPRecipStepFused.cpp @@ -3,14 +3,14 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/fused.h" -#include "common/fp/info.h" -#include "common/fp/op/FPNeg.h" -#include "common/fp/op/FPRecipStepFused.h" -#include "common/fp/process_nan.h" -#include "common/fp/unpacked.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/fused.h" +#include "dynarmic/common/fp/info.h" +#include "dynarmic/common/fp/op/FPNeg.h" +#include "dynarmic/common/fp/op/FPRecipStepFused.h" +#include "dynarmic/common/fp/process_nan.h" +#include "dynarmic/common/fp/unpacked.h" namespace Dynarmic::FP { diff --git a/src/common/fp/op/FPRecipStepFused.h b/src/dynarmic/common/fp/op/FPRecipStepFused.h similarity index 100% rename from src/common/fp/op/FPRecipStepFused.h rename to src/dynarmic/common/fp/op/FPRecipStepFused.h diff --git a/src/common/fp/op/FPRoundInt.cpp b/src/dynarmic/common/fp/op/FPRoundInt.cpp similarity index 83% rename from src/common/fp/op/FPRoundInt.cpp rename to src/dynarmic/common/fp/op/FPRoundInt.cpp index 37b2ad22..e94f2be6 100644 --- a/src/common/fp/op/FPRoundInt.cpp +++ b/src/dynarmic/common/fp/op/FPRoundInt.cpp @@ -3,19 +3,19 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/common_types.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/info.h" -#include "common/fp/mantissa_util.h" -#include "common/fp/op/FPRoundInt.h" -#include "common/fp/process_exception.h" -#include "common/fp/process_nan.h" -#include "common/fp/rounding_mode.h" -#include "common/fp/unpacked.h" -#include "common/safe_ops.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/info.h" +#include "dynarmic/common/fp/mantissa_util.h" +#include "dynarmic/common/fp/op/FPRoundInt.h" +#include "dynarmic/common/fp/process_exception.h" +#include "dynarmic/common/fp/process_nan.h" +#include "dynarmic/common/fp/rounding_mode.h" +#include "dynarmic/common/fp/unpacked.h" +#include "dynarmic/common/safe_ops.h" namespace Dynarmic::FP { diff --git a/src/common/fp/op/FPRoundInt.h b/src/dynarmic/common/fp/op/FPRoundInt.h similarity index 89% rename from src/common/fp/op/FPRoundInt.h rename to src/dynarmic/common/fp/op/FPRoundInt.h index 7b1fd1eb..c070fdf4 100644 --- a/src/common/fp/op/FPRoundInt.h +++ b/src/dynarmic/common/fp/op/FPRoundInt.h @@ -5,7 +5,7 @@ #pragma once -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::FP { diff --git a/src/common/fp/op/FPToFixed.cpp b/src/dynarmic/common/fp/op/FPToFixed.cpp similarity index 88% rename from src/common/fp/op/FPToFixed.cpp rename to src/dynarmic/common/fp/op/FPToFixed.cpp index d5c2381e..ae755e67 100644 --- a/src/common/fp/op/FPToFixed.cpp +++ b/src/dynarmic/common/fp/op/FPToFixed.cpp @@ -3,17 +3,17 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/common_types.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/mantissa_util.h" -#include "common/fp/op/FPToFixed.h" -#include "common/fp/process_exception.h" -#include "common/fp/rounding_mode.h" -#include "common/fp/unpacked.h" -#include "common/safe_ops.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/mantissa_util.h" +#include "dynarmic/common/fp/op/FPToFixed.h" +#include "dynarmic/common/fp/process_exception.h" +#include "dynarmic/common/fp/rounding_mode.h" +#include "dynarmic/common/fp/unpacked.h" +#include "dynarmic/common/safe_ops.h" namespace Dynarmic::FP { diff --git a/src/common/fp/op/FPToFixed.h b/src/dynarmic/common/fp/op/FPToFixed.h similarity index 89% rename from src/common/fp/op/FPToFixed.h rename to src/dynarmic/common/fp/op/FPToFixed.h index f9c51108..b44587ae 100644 --- a/src/common/fp/op/FPToFixed.h +++ b/src/dynarmic/common/fp/op/FPToFixed.h @@ -5,7 +5,7 @@ #pragma once -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::FP { diff --git a/src/common/fp/process_exception.cpp b/src/dynarmic/common/fp/process_exception.cpp similarity index 89% rename from src/common/fp/process_exception.cpp rename to src/dynarmic/common/fp/process_exception.cpp index 44e0aab7..d427964e 100644 --- a/src/common/fp/process_exception.cpp +++ b/src/dynarmic/common/fp/process_exception.cpp @@ -3,10 +3,10 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/assert.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/process_exception.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/process_exception.h" namespace Dynarmic::FP { diff --git a/src/common/fp/process_exception.h b/src/dynarmic/common/fp/process_exception.h similarity index 100% rename from src/common/fp/process_exception.h rename to src/dynarmic/common/fp/process_exception.h diff --git a/src/common/fp/process_nan.cpp b/src/dynarmic/common/fp/process_nan.cpp similarity index 90% rename from src/common/fp/process_nan.cpp rename to src/dynarmic/common/fp/process_nan.cpp index 196bbd38..71e5e348 100644 --- a/src/common/fp/process_nan.cpp +++ b/src/dynarmic/common/fp/process_nan.cpp @@ -5,14 +5,14 @@ #include -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/info.h" -#include "common/fp/process_exception.h" -#include "common/fp/process_nan.h" -#include "common/fp/unpacked.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/info.h" +#include "dynarmic/common/fp/process_exception.h" +#include "dynarmic/common/fp/process_nan.h" +#include "dynarmic/common/fp/unpacked.h" namespace Dynarmic::FP { diff --git a/src/common/fp/process_nan.h b/src/dynarmic/common/fp/process_nan.h similarity index 100% rename from src/common/fp/process_nan.h rename to src/dynarmic/common/fp/process_nan.h diff --git a/src/common/fp/rounding_mode.h b/src/dynarmic/common/fp/rounding_mode.h similarity index 100% rename from src/common/fp/rounding_mode.h rename to src/dynarmic/common/fp/rounding_mode.h diff --git a/src/common/fp/unpacked.cpp b/src/dynarmic/common/fp/unpacked.cpp similarity index 96% rename from src/common/fp/unpacked.cpp rename to src/dynarmic/common/fp/unpacked.cpp index 9b2ebde2..53bc1ead 100644 --- a/src/common/fp/unpacked.cpp +++ b/src/dynarmic/common/fp/unpacked.cpp @@ -3,13 +3,13 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/fp/fpsr.h" -#include "common/fp/info.h" -#include "common/fp/mantissa_util.h" -#include "common/fp/process_exception.h" -#include "common/fp/rounding_mode.h" -#include "common/fp/unpacked.h" -#include "common/safe_ops.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/info.h" +#include "dynarmic/common/fp/mantissa_util.h" +#include "dynarmic/common/fp/process_exception.h" +#include "dynarmic/common/fp/rounding_mode.h" +#include "dynarmic/common/fp/unpacked.h" +#include "dynarmic/common/safe_ops.h" namespace Dynarmic::FP { diff --git a/src/common/fp/unpacked.h b/src/dynarmic/common/fp/unpacked.h similarity index 96% rename from src/common/fp/unpacked.h rename to src/dynarmic/common/fp/unpacked.h index 3096c8d0..4431a637 100644 --- a/src/common/fp/unpacked.h +++ b/src/dynarmic/common/fp/unpacked.h @@ -7,8 +7,8 @@ #include -#include "common/common_types.h" -#include "common/fp/fpcr.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" namespace Dynarmic::FP { diff --git a/src/common/fp/util.h b/src/dynarmic/common/fp/util.h similarity index 97% rename from src/common/fp/util.h rename to src/dynarmic/common/fp/util.h index 96740a39..c21f6ef8 100644 --- a/src/common/fp/util.h +++ b/src/dynarmic/common/fp/util.h @@ -7,8 +7,8 @@ #include -#include "common/fp/fpcr.h" -#include "common/fp/info.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/info.h" namespace Dynarmic::FP { diff --git a/src/common/intrusive_list.h b/src/dynarmic/common/intrusive_list.h similarity index 99% rename from src/common/intrusive_list.h rename to src/dynarmic/common/intrusive_list.h index 5e771539..ea27a5ac 100644 --- a/src/common/intrusive_list.h +++ b/src/dynarmic/common/intrusive_list.h @@ -10,7 +10,7 @@ #include #include -#include "common/assert.h" +#include "dynarmic/common/assert.h" namespace Dynarmic::Common { diff --git a/src/common/iterator_util.h b/src/dynarmic/common/iterator_util.h similarity index 100% rename from src/common/iterator_util.h rename to src/dynarmic/common/iterator_util.h diff --git a/src/common/llvm_disassemble.cpp b/src/dynarmic/common/llvm_disassemble.cpp similarity index 96% rename from src/common/llvm_disassemble.cpp rename to src/dynarmic/common/llvm_disassemble.cpp index d3483107..9e942a74 100644 --- a/src/common/llvm_disassemble.cpp +++ b/src/dynarmic/common/llvm_disassemble.cpp @@ -12,9 +12,9 @@ #include #endif -#include "common/assert.h" -#include "common/common_types.h" -#include "common/llvm_disassemble.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/llvm_disassemble.h" namespace Dynarmic::Common { diff --git a/src/common/llvm_disassemble.h b/src/dynarmic/common/llvm_disassemble.h similarity index 91% rename from src/common/llvm_disassemble.h rename to src/dynarmic/common/llvm_disassemble.h index 0d9ac6a9..21d0aea4 100644 --- a/src/common/llvm_disassemble.h +++ b/src/dynarmic/common/llvm_disassemble.h @@ -7,7 +7,7 @@ #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Common { diff --git a/src/common/lut_from_list.h b/src/dynarmic/common/lut_from_list.h similarity index 100% rename from src/common/lut_from_list.h rename to src/dynarmic/common/lut_from_list.h diff --git a/src/common/macro_util.h b/src/dynarmic/common/macro_util.h similarity index 100% rename from src/common/macro_util.h rename to src/dynarmic/common/macro_util.h diff --git a/src/common/math_util.cpp b/src/dynarmic/common/math_util.cpp similarity index 97% rename from src/common/math_util.cpp rename to src/dynarmic/common/math_util.cpp index 7505f68f..61800f35 100644 --- a/src/common/math_util.cpp +++ b/src/dynarmic/common/math_util.cpp @@ -4,7 +4,7 @@ */ #include -#include "common/math_util.h" +#include "dynarmic/common/math_util.h" namespace Dynarmic::Common { diff --git a/src/common/math_util.h b/src/dynarmic/common/math_util.h similarity index 96% rename from src/common/math_util.h rename to src/dynarmic/common/math_util.h index 8cf523e4..d30ebebd 100644 --- a/src/common/math_util.h +++ b/src/dynarmic/common/math_util.h @@ -7,7 +7,7 @@ #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::Common { diff --git a/src/common/memory_pool.cpp b/src/dynarmic/common/memory_pool.cpp similarity index 95% rename from src/common/memory_pool.cpp rename to src/dynarmic/common/memory_pool.cpp index a8fc6a29..58f86b5e 100644 --- a/src/common/memory_pool.cpp +++ b/src/dynarmic/common/memory_pool.cpp @@ -5,7 +5,7 @@ #include -#include "common/memory_pool.h" +#include "dynarmic/common/memory_pool.h" namespace Dynarmic::Common { diff --git a/src/common/memory_pool.h b/src/dynarmic/common/memory_pool.h similarity index 100% rename from src/common/memory_pool.h rename to src/dynarmic/common/memory_pool.h diff --git a/src/common/safe_ops.h b/src/dynarmic/common/safe_ops.h similarity index 96% rename from src/common/safe_ops.h rename to src/dynarmic/common/safe_ops.h index b66396d7..fbd17f62 100644 --- a/src/common/safe_ops.h +++ b/src/dynarmic/common/safe_ops.h @@ -7,9 +7,9 @@ #include -#include "common/bit_util.h" -#include "common/common_types.h" -#include "common/u128.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/u128.h" namespace Dynarmic::Safe { diff --git a/src/common/scope_exit.h b/src/dynarmic/common/scope_exit.h similarity index 98% rename from src/common/scope_exit.h rename to src/dynarmic/common/scope_exit.h index 5db5eaa3..fbe8378d 100644 --- a/src/common/scope_exit.h +++ b/src/dynarmic/common/scope_exit.h @@ -9,7 +9,7 @@ #include #include -#include "common/macro_util.h" +#include "dynarmic/common/macro_util.h" namespace Dynarmic::detail { diff --git a/src/common/string_util.h b/src/dynarmic/common/string_util.h similarity index 100% rename from src/common/string_util.h rename to src/dynarmic/common/string_util.h diff --git a/src/common/u128.cpp b/src/dynarmic/common/u128.cpp similarity index 97% rename from src/common/u128.cpp rename to src/dynarmic/common/u128.cpp index 9433e7f0..c8c7d4ae 100644 --- a/src/common/u128.cpp +++ b/src/dynarmic/common/u128.cpp @@ -3,8 +3,8 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/common_types.h" -#include "common/u128.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/u128.h" namespace Dynarmic { diff --git a/src/common/u128.h b/src/dynarmic/common/u128.h similarity index 96% rename from src/common/u128.h rename to src/dynarmic/common/u128.h index 891c0f37..04b8ed1b 100644 --- a/src/common/u128.h +++ b/src/dynarmic/common/u128.h @@ -8,8 +8,8 @@ #include #include -#include "common/bit_util.h" -#include "common/common_types.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic { diff --git a/src/common/unlikely.h b/src/dynarmic/common/unlikely.h similarity index 100% rename from src/common/unlikely.h rename to src/dynarmic/common/unlikely.h diff --git a/src/common/variant_util.h b/src/dynarmic/common/variant_util.h similarity index 100% rename from src/common/variant_util.h rename to src/dynarmic/common/variant_util.h diff --git a/src/frontend/A32/FPSCR.h b/src/dynarmic/frontend/A32/FPSCR.h similarity index 97% rename from src/frontend/A32/FPSCR.h rename to src/dynarmic/frontend/A32/FPSCR.h index ea774633..8ea745f5 100644 --- a/src/frontend/A32/FPSCR.h +++ b/src/dynarmic/frontend/A32/FPSCR.h @@ -7,9 +7,9 @@ #include -#include "common/bit_util.h" -#include "common/common_types.h" -#include "common/fp/rounding_mode.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/rounding_mode.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/ITState.h b/src/dynarmic/frontend/A32/ITState.h similarity index 91% rename from src/frontend/A32/ITState.h rename to src/dynarmic/frontend/A32/ITState.h index dfe3cf13..000acfeb 100644 --- a/src/frontend/A32/ITState.h +++ b/src/dynarmic/frontend/A32/ITState.h @@ -5,9 +5,9 @@ #pragma once -#include "common/common_types.h" -#include "common/bit_util.h" -#include "ir/cond.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/ir/cond.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/PSR.h b/src/dynarmic/frontend/A32/PSR.h similarity index 97% rename from src/frontend/A32/PSR.h rename to src/dynarmic/frontend/A32/PSR.h index ff061292..9fc589f5 100644 --- a/src/frontend/A32/PSR.h +++ b/src/dynarmic/frontend/A32/PSR.h @@ -5,9 +5,9 @@ #pragma once -#include "common/bit_util.h" -#include "common/common_types.h" -#include "frontend/A32/ITState.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/A32/ITState.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/decoder/arm.h b/src/dynarmic/frontend/A32/decoder/arm.h similarity index 87% rename from src/frontend/A32/decoder/arm.h rename to src/dynarmic/frontend/A32/decoder/arm.h index 442fe67d..abe66213 100644 --- a/src/frontend/A32/decoder/arm.h +++ b/src/dynarmic/frontend/A32/decoder/arm.h @@ -12,10 +12,10 @@ #include #include -#include "common/bit_util.h" -#include "common/common_types.h" -#include "frontend/decoder/decoder_detail.h" -#include "frontend/decoder/matcher.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/decoder/decoder_detail.h" +#include "dynarmic/frontend/decoder/matcher.h" namespace Dynarmic::A32 { @@ -27,7 +27,7 @@ std::vector> GetArmDecodeTable() { std::vector> table = { #define INST(fn, name, bitstring) DYNARMIC_DECODER_GET_MATCHER(ArmMatcher, fn, name, Decoder::detail::StringToArray<32>(bitstring)), -#include "arm.inc" +#include "./arm.inc" #undef INST }; diff --git a/src/frontend/A32/decoder/arm.inc b/src/dynarmic/frontend/A32/decoder/arm.inc similarity index 100% rename from src/frontend/A32/decoder/arm.inc rename to src/dynarmic/frontend/A32/decoder/arm.inc diff --git a/src/frontend/A32/decoder/asimd.h b/src/dynarmic/frontend/A32/decoder/asimd.h similarity index 91% rename from src/frontend/A32/decoder/asimd.h rename to src/dynarmic/frontend/A32/decoder/asimd.h index 07fb0f71..126d941c 100644 --- a/src/frontend/A32/decoder/asimd.h +++ b/src/dynarmic/frontend/A32/decoder/asimd.h @@ -11,10 +11,10 @@ #include #include -#include "common/bit_util.h" -#include "common/common_types.h" -#include "frontend/decoder/decoder_detail.h" -#include "frontend/decoder/matcher.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/decoder/decoder_detail.h" +#include "dynarmic/frontend/decoder/matcher.h" namespace Dynarmic::A32 { @@ -26,7 +26,7 @@ std::vector> GetASIMDDecodeTable() { std::vector> table = { #define INST(fn, name, bitstring) DYNARMIC_DECODER_GET_MATCHER(ASIMDMatcher, fn, name, Decoder::detail::StringToArray<32>(bitstring)), -#include "asimd.inc" +#include "./asimd.inc" #undef INST }; diff --git a/src/frontend/A32/decoder/asimd.inc b/src/dynarmic/frontend/A32/decoder/asimd.inc similarity index 100% rename from src/frontend/A32/decoder/asimd.inc rename to src/dynarmic/frontend/A32/decoder/asimd.inc diff --git a/src/frontend/A32/decoder/thumb16.h b/src/dynarmic/frontend/A32/decoder/thumb16.h similarity index 85% rename from src/frontend/A32/decoder/thumb16.h rename to src/dynarmic/frontend/A32/decoder/thumb16.h index b1ce7446..75aa5efb 100644 --- a/src/frontend/A32/decoder/thumb16.h +++ b/src/dynarmic/frontend/A32/decoder/thumb16.h @@ -10,9 +10,9 @@ #include #include -#include "common/common_types.h" -#include "frontend/decoder/decoder_detail.h" -#include "frontend/decoder/matcher.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/decoder/decoder_detail.h" +#include "dynarmic/frontend/decoder/matcher.h" namespace Dynarmic::A32 { @@ -24,7 +24,7 @@ std::optional>> DecodeThumb16(u16 static const std::vector> table = { #define INST(fn, name, bitstring) DYNARMIC_DECODER_GET_MATCHER(Thumb16Matcher, fn, name, Decoder::detail::StringToArray<16>(bitstring)), -#include "thumb16.inc" +#include "./thumb16.inc" #undef INST }; diff --git a/src/frontend/A32/decoder/thumb16.inc b/src/dynarmic/frontend/A32/decoder/thumb16.inc similarity index 100% rename from src/frontend/A32/decoder/thumb16.inc rename to src/dynarmic/frontend/A32/decoder/thumb16.inc diff --git a/src/frontend/A32/decoder/thumb32.h b/src/dynarmic/frontend/A32/decoder/thumb32.h similarity index 85% rename from src/frontend/A32/decoder/thumb32.h rename to src/dynarmic/frontend/A32/decoder/thumb32.h index dc370a31..0692f53c 100644 --- a/src/frontend/A32/decoder/thumb32.h +++ b/src/dynarmic/frontend/A32/decoder/thumb32.h @@ -9,9 +9,9 @@ #include #include -#include "common/common_types.h" -#include "frontend/decoder/decoder_detail.h" -#include "frontend/decoder/matcher.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/decoder/decoder_detail.h" +#include "dynarmic/frontend/decoder/matcher.h" namespace Dynarmic::A32 { @@ -23,7 +23,7 @@ std::optional>> DecodeThumb32(u32 static const std::vector> table = { #define INST(fn, name, bitstring) DYNARMIC_DECODER_GET_MATCHER(Thumb32Matcher, fn, name, Decoder::detail::StringToArray<32>(bitstring)), -#include "thumb32.inc" +#include "./thumb32.inc" #undef INST }; diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/dynarmic/frontend/A32/decoder/thumb32.inc similarity index 100% rename from src/frontend/A32/decoder/thumb32.inc rename to src/dynarmic/frontend/A32/decoder/thumb32.inc diff --git a/src/frontend/A32/decoder/vfp.h b/src/dynarmic/frontend/A32/decoder/vfp.h similarity index 90% rename from src/frontend/A32/decoder/vfp.h rename to src/dynarmic/frontend/A32/decoder/vfp.h index 1abfc67a..cb376169 100644 --- a/src/frontend/A32/decoder/vfp.h +++ b/src/dynarmic/frontend/A32/decoder/vfp.h @@ -11,9 +11,9 @@ #include -#include "common/common_types.h" -#include "frontend/decoder/decoder_detail.h" -#include "frontend/decoder/matcher.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/decoder/decoder_detail.h" +#include "dynarmic/frontend/decoder/matcher.h" namespace Dynarmic::A32 { @@ -31,7 +31,7 @@ std::optional>> DecodeVFP(u32 instruc Table list = { #define INST(fn, name, bitstring) DYNARMIC_DECODER_GET_MATCHER(VFPMatcher, fn, name, Decoder::detail::StringToArray<32>(bitstring)), -#include "vfp.inc" +#include "./vfp.inc" #undef INST }; diff --git a/src/frontend/A32/decoder/vfp.inc b/src/dynarmic/frontend/A32/decoder/vfp.inc similarity index 100% rename from src/frontend/A32/decoder/vfp.inc rename to src/dynarmic/frontend/A32/decoder/vfp.inc diff --git a/src/frontend/A32/disassembler/disassembler.h b/src/dynarmic/frontend/A32/disassembler/disassembler.h similarity index 87% rename from src/frontend/A32/disassembler/disassembler.h rename to src/dynarmic/frontend/A32/disassembler/disassembler.h index 1f59c753..3e2f686a 100644 --- a/src/frontend/A32/disassembler/disassembler.h +++ b/src/dynarmic/frontend/A32/disassembler/disassembler.h @@ -7,7 +7,7 @@ #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/disassembler/disassembler_arm.cpp b/src/dynarmic/frontend/A32/disassembler/disassembler_arm.cpp similarity index 99% rename from src/frontend/A32/disassembler/disassembler_arm.cpp rename to src/dynarmic/frontend/A32/disassembler/disassembler_arm.cpp index f7b4329c..fcf8a1a1 100644 --- a/src/frontend/A32/disassembler/disassembler_arm.cpp +++ b/src/dynarmic/frontend/A32/disassembler/disassembler_arm.cpp @@ -9,13 +9,13 @@ #include #include -#include "common/bit_util.h" -#include "common/string_util.h" -#include "frontend/imm.h" -#include "frontend/A32/decoder/arm.h" -#include "frontend/A32/decoder/vfp.h" -#include "frontend/A32/disassembler/disassembler.h" -#include "frontend/A32/types.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/string_util.h" +#include "dynarmic/frontend/imm.h" +#include "dynarmic/frontend/A32/decoder/arm.h" +#include "dynarmic/frontend/A32/decoder/vfp.h" +#include "dynarmic/frontend/A32/disassembler/disassembler.h" +#include "dynarmic/frontend/A32/types.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/disassembler/disassembler_thumb.cpp b/src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp similarity index 97% rename from src/frontend/A32/disassembler/disassembler_thumb.cpp rename to src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp index 0c85e7e4..345d778f 100644 --- a/src/frontend/A32/disassembler/disassembler_thumb.cpp +++ b/src/dynarmic/frontend/A32/disassembler/disassembler_thumb.cpp @@ -9,12 +9,12 @@ #include #include -#include "common/bit_util.h" -#include "common/string_util.h" -#include "frontend/imm.h" -#include "frontend/A32/decoder/thumb16.h" -#include "frontend/A32/disassembler/disassembler.h" -#include "frontend/A32/types.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/string_util.h" +#include "dynarmic/frontend/imm.h" +#include "dynarmic/frontend/A32/decoder/thumb16.h" +#include "dynarmic/frontend/A32/disassembler/disassembler.h" +#include "dynarmic/frontend/A32/types.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/ir_emitter.cpp b/src/dynarmic/frontend/A32/ir_emitter.cpp similarity index 98% rename from src/frontend/A32/ir_emitter.cpp rename to src/dynarmic/frontend/A32/ir_emitter.cpp index a0cc3b89..ac77a610 100644 --- a/src/frontend/A32/ir_emitter.cpp +++ b/src/dynarmic/frontend/A32/ir_emitter.cpp @@ -3,12 +3,11 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/assert.h" -#include "frontend/A32/ir_emitter.h" -#include "frontend/A32/types.h" -#include "ir/opcodes.h" - -#include +#include "dynarmic/common/assert.h" +#include "dynarmic/frontend/A32/ir_emitter.h" +#include "dynarmic/frontend/A32/types.h" +#include "dynarmic/interface/A32/arch_version.h" +#include "dynarmic/ir/opcodes.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/ir_emitter.h b/src/dynarmic/frontend/A32/ir_emitter.h similarity index 96% rename from src/frontend/A32/ir_emitter.h rename to src/dynarmic/frontend/A32/ir_emitter.h index 62f1e76b..816ddcaa 100644 --- a/src/frontend/A32/ir_emitter.h +++ b/src/dynarmic/frontend/A32/ir_emitter.h @@ -7,10 +7,10 @@ #include -#include "common/common_types.h" -#include "frontend/A32/location_descriptor.h" -#include "ir/ir_emitter.h" -#include "ir/value.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/A32/location_descriptor.h" +#include "dynarmic/ir/ir_emitter.h" +#include "dynarmic/ir/value.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/location_descriptor.cpp b/src/dynarmic/frontend/A32/location_descriptor.cpp similarity index 91% rename from src/frontend/A32/location_descriptor.cpp rename to src/dynarmic/frontend/A32/location_descriptor.cpp index a170f24d..7844f78c 100644 --- a/src/frontend/A32/location_descriptor.cpp +++ b/src/dynarmic/frontend/A32/location_descriptor.cpp @@ -5,7 +5,7 @@ #include #include -#include "frontend/A32/location_descriptor.h" +#include "dynarmic/frontend/A32/location_descriptor.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/location_descriptor.h b/src/dynarmic/frontend/A32/location_descriptor.h similarity index 95% rename from src/frontend/A32/location_descriptor.h rename to src/dynarmic/frontend/A32/location_descriptor.h index ad664848..c7117daf 100644 --- a/src/frontend/A32/location_descriptor.h +++ b/src/dynarmic/frontend/A32/location_descriptor.h @@ -8,11 +8,11 @@ #include #include #include -#include "common/common_types.h" -#include "frontend/A32/FPSCR.h" -#include "frontend/A32/PSR.h" -#include "frontend/A32/ITState.h" -#include "ir/location_descriptor.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/A32/FPSCR.h" +#include "dynarmic/frontend/A32/PSR.h" +#include "dynarmic/frontend/A32/ITState.h" +#include "dynarmic/ir/location_descriptor.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/conditional_state.cpp b/src/dynarmic/frontend/A32/translate/conditional_state.cpp similarity index 88% rename from src/frontend/A32/translate/conditional_state.cpp rename to src/dynarmic/frontend/A32/translate/conditional_state.cpp index e156b1c3..4673c8a2 100644 --- a/src/frontend/A32/translate/conditional_state.cpp +++ b/src/dynarmic/frontend/A32/translate/conditional_state.cpp @@ -5,14 +5,13 @@ #include -#include - -#include "common/assert.h" -#include "common/common_types.h" -#include "frontend/A32/ir_emitter.h" -#include "frontend/A32/translate/conditional_state.h" -#include "frontend/A32/translate/impl/translate.h" -#include "ir/cond.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/A32/ir_emitter.h" +#include "dynarmic/frontend/A32/translate/conditional_state.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" +#include "dynarmic/interface/A32/config.h" +#include "dynarmic/ir/cond.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/conditional_state.h b/src/dynarmic/frontend/A32/translate/conditional_state.h similarity index 95% rename from src/frontend/A32/translate/conditional_state.h rename to src/dynarmic/frontend/A32/translate/conditional_state.h index bba7f05b..8ec42392 100644 --- a/src/frontend/A32/translate/conditional_state.h +++ b/src/dynarmic/frontend/A32/translate/conditional_state.h @@ -5,7 +5,7 @@ #pragma once -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::IR { enum class Cond; diff --git a/src/frontend/A32/translate/impl/asimd_load_store_structures.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_load_store_structures.cpp similarity index 99% rename from src/frontend/A32/translate/impl/asimd_load_store_structures.cpp rename to src/dynarmic/frontend/A32/translate/impl/asimd_load_store_structures.cpp index 89df96fb..5c9f35de 100644 --- a/src/frontend/A32/translate/impl/asimd_load_store_structures.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/asimd_load_store_structures.cpp @@ -3,11 +3,11 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" #include #include -#include "common/bit_util.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/asimd_misc.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_misc.cpp similarity index 95% rename from src/frontend/A32/translate/impl/asimd_misc.cpp rename to src/dynarmic/frontend/A32/translate/impl/asimd_misc.cpp index d109b8b3..cdb022be 100644 --- a/src/frontend/A32/translate/impl/asimd_misc.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/asimd_misc.cpp @@ -3,10 +3,10 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include "common/assert.h" -#include "common/bit_util.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp similarity index 95% rename from src/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp rename to src/dynarmic/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp index 13e8c5bf..73f2dac7 100644 --- a/src/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/asimd_one_reg_modified_immediate.cpp @@ -3,10 +3,10 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include "common/assert.h" -#include "common/bit_util.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/asimd_three_regs.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_three_regs.cpp similarity index 99% rename from src/frontend/A32/translate/impl/asimd_three_regs.cpp rename to src/dynarmic/frontend/A32/translate/impl/asimd_three_regs.cpp index 8ac59ff5..bc37e44f 100644 --- a/src/frontend/A32/translate/impl/asimd_three_regs.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/asimd_three_regs.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include "common/bit_util.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { namespace { diff --git a/src/frontend/A32/translate/impl/asimd_two_regs_misc.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_misc.cpp similarity index 99% rename from src/frontend/A32/translate/impl/asimd_two_regs_misc.cpp rename to src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_misc.cpp index d4c3153f..18e29a1e 100644 --- a/src/frontend/A32/translate/impl/asimd_two_regs_misc.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_misc.cpp @@ -3,11 +3,11 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" #include -#include "common/bit_util.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { namespace { diff --git a/src/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp similarity index 98% rename from src/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp rename to src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp index 44c6647b..f8d304c2 100644 --- a/src/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_scalar.cpp @@ -3,12 +3,12 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" #include -#include "common/assert.h" -#include "common/bit_util.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { namespace { diff --git a/src/frontend/A32/translate/impl/asimd_two_regs_shift.cpp b/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_shift.cpp similarity index 98% rename from src/frontend/A32/translate/impl/asimd_two_regs_shift.cpp rename to src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_shift.cpp index c36437bf..69c87e2f 100644 --- a/src/frontend/A32/translate/impl/asimd_two_regs_shift.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/asimd_two_regs_shift.cpp @@ -3,10 +3,10 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include "common/assert.h" -#include "common/bit_util.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { namespace { diff --git a/src/frontend/A32/translate/impl/barrier.cpp b/src/dynarmic/frontend/A32/translate/impl/barrier.cpp similarity index 91% rename from src/frontend/A32/translate/impl/barrier.cpp rename to src/dynarmic/frontend/A32/translate/impl/barrier.cpp index e1489e52..7b7ad67c 100644 --- a/src/frontend/A32/translate/impl/barrier.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/barrier.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/branch.cpp b/src/dynarmic/frontend/A32/translate/impl/branch.cpp similarity index 95% rename from src/frontend/A32/translate/impl/branch.cpp rename to src/dynarmic/frontend/A32/translate/impl/branch.cpp index f2d8115c..f838d4eb 100644 --- a/src/frontend/A32/translate/impl/branch.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/branch.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include "common/bit_util.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/coprocessor.cpp b/src/dynarmic/frontend/A32/translate/impl/coprocessor.cpp similarity index 98% rename from src/frontend/A32/translate/impl/coprocessor.cpp rename to src/dynarmic/frontend/A32/translate/impl/coprocessor.cpp index fdd878b2..7ab7eba1 100644 --- a/src/frontend/A32/translate/impl/coprocessor.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/coprocessor.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/crc32.cpp b/src/dynarmic/frontend/A32/translate/impl/crc32.cpp similarity index 97% rename from src/frontend/A32/translate/impl/crc32.cpp rename to src/dynarmic/frontend/A32/translate/impl/crc32.cpp index 9843c8f5..7718f351 100644 --- a/src/frontend/A32/translate/impl/crc32.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/crc32.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/data_processing.cpp b/src/dynarmic/frontend/A32/translate/impl/data_processing.cpp similarity index 99% rename from src/frontend/A32/translate/impl/data_processing.cpp rename to src/dynarmic/frontend/A32/translate/impl/data_processing.cpp index 9416d194..b4260cab 100644 --- a/src/frontend/A32/translate/impl/data_processing.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/data_processing.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/divide.cpp b/src/dynarmic/frontend/A32/translate/impl/divide.cpp similarity index 95% rename from src/frontend/A32/translate/impl/divide.cpp rename to src/dynarmic/frontend/A32/translate/impl/divide.cpp index 7b14d56a..358ac254 100644 --- a/src/frontend/A32/translate/impl/divide.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/divide.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { namespace { diff --git a/src/frontend/A32/translate/impl/exception_generating.cpp b/src/dynarmic/frontend/A32/translate/impl/exception_generating.cpp similarity index 91% rename from src/frontend/A32/translate/impl/exception_generating.cpp rename to src/dynarmic/frontend/A32/translate/impl/exception_generating.cpp index 34152fe3..547f0d49 100644 --- a/src/frontend/A32/translate/impl/exception_generating.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/exception_generating.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include +#include "dynarmic/interface/A32/config.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/extension.cpp b/src/dynarmic/frontend/A32/translate/impl/extension.cpp similarity index 99% rename from src/frontend/A32/translate/impl/extension.cpp rename to src/dynarmic/frontend/A32/translate/impl/extension.cpp index 9804be5b..ee85e4d0 100644 --- a/src/frontend/A32/translate/impl/extension.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/extension.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/hint.cpp b/src/dynarmic/frontend/A32/translate/impl/hint.cpp similarity index 93% rename from src/frontend/A32/translate/impl/hint.cpp rename to src/dynarmic/frontend/A32/translate/impl/hint.cpp index 80521d2c..3923a553 100644 --- a/src/frontend/A32/translate/impl/hint.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/hint.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include +#include "dynarmic/interface/A32/config.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/load_store.cpp b/src/dynarmic/frontend/A32/translate/impl/load_store.cpp similarity index 99% rename from src/frontend/A32/translate/impl/load_store.cpp rename to src/dynarmic/frontend/A32/translate/impl/load_store.cpp index 8fbf6e66..3e413294 100644 --- a/src/frontend/A32/translate/impl/load_store.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/load_store.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/misc.cpp b/src/dynarmic/frontend/A32/translate/impl/misc.cpp similarity index 98% rename from src/frontend/A32/translate/impl/misc.cpp rename to src/dynarmic/frontend/A32/translate/impl/misc.cpp index 7101298c..e8ace86c 100644 --- a/src/frontend/A32/translate/impl/misc.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/misc.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include "common/bit_util.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/multiply.cpp b/src/dynarmic/frontend/A32/translate/impl/multiply.cpp similarity index 99% rename from src/frontend/A32/translate/impl/multiply.cpp rename to src/dynarmic/frontend/A32/translate/impl/multiply.cpp index e87ed474..55709d16 100644 --- a/src/frontend/A32/translate/impl/multiply.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/multiply.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/packing.cpp b/src/dynarmic/frontend/A32/translate/impl/packing.cpp similarity index 95% rename from src/frontend/A32/translate/impl/packing.cpp rename to src/dynarmic/frontend/A32/translate/impl/packing.cpp index 4482933a..59bd6dc9 100644 --- a/src/frontend/A32/translate/impl/packing.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/packing.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/parallel.cpp b/src/dynarmic/frontend/A32/translate/impl/parallel.cpp similarity index 99% rename from src/frontend/A32/translate/impl/parallel.cpp rename to src/dynarmic/frontend/A32/translate/impl/parallel.cpp index 328734a7..2439bcc0 100644 --- a/src/frontend/A32/translate/impl/parallel.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/parallel.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/reversal.cpp b/src/dynarmic/frontend/A32/translate/impl/reversal.cpp similarity index 97% rename from src/frontend/A32/translate/impl/reversal.cpp rename to src/dynarmic/frontend/A32/translate/impl/reversal.cpp index a32d89dd..c494ec8c 100644 --- a/src/frontend/A32/translate/impl/reversal.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/reversal.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/saturated.cpp b/src/dynarmic/frontend/A32/translate/impl/saturated.cpp similarity index 99% rename from src/frontend/A32/translate/impl/saturated.cpp rename to src/dynarmic/frontend/A32/translate/impl/saturated.cpp index 82b2b818..120e0a3b 100644 --- a/src/frontend/A32/translate/impl/saturated.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/saturated.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/status_register_access.cpp b/src/dynarmic/frontend/A32/translate/impl/status_register_access.cpp similarity index 96% rename from src/frontend/A32/translate/impl/status_register_access.cpp rename to src/dynarmic/frontend/A32/translate/impl/status_register_access.cpp index 10fc0017..d0d92595 100644 --- a/src/frontend/A32/translate/impl/status_register_access.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/status_register_access.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include "common/bit_util.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/synchronization.cpp b/src/dynarmic/frontend/A32/translate/impl/synchronization.cpp similarity index 99% rename from src/frontend/A32/translate/impl/synchronization.cpp rename to src/dynarmic/frontend/A32/translate/impl/synchronization.cpp index 14600800..eb8c87be 100644 --- a/src/frontend/A32/translate/impl/synchronization.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/synchronization.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/thumb16.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb16.cpp similarity index 99% rename from src/frontend/A32/translate/impl/thumb16.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb16.cpp index 34b0fc10..f95b828d 100644 --- a/src/frontend/A32/translate/impl/thumb16.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb16.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include +#include "dynarmic/interface/A32/config.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/thumb32_branch.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_branch.cpp similarity index 98% rename from src/frontend/A32/translate/impl/thumb32_branch.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_branch.cpp index 378f6102..909efdbc 100644 --- a/src/frontend/A32/translate/impl/thumb32_branch.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_branch.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/thumb32_control.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_control.cpp similarity index 98% rename from src/frontend/A32/translate/impl/thumb32_control.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_control.cpp index 9c192ca3..96a46950 100644 --- a/src/frontend/A32/translate/impl/thumb32_control.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_control.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/thumb32_coprocessor.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_coprocessor.cpp similarity index 98% rename from src/frontend/A32/translate/impl/thumb32_coprocessor.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_coprocessor.cpp index e7ad603e..1261c945 100644 --- a/src/frontend/A32/translate/impl/thumb32_coprocessor.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_coprocessor.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp similarity index 99% rename from src/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp index 652cf5bd..da7a6552 100644 --- a/src/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_plain_binary_immediate.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_plain_binary_immediate.cpp similarity index 98% rename from src/frontend/A32/translate/impl/thumb32_data_processing_plain_binary_immediate.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_plain_binary_immediate.cpp index 48658a64..b17611e4 100644 --- a/src/frontend/A32/translate/impl/thumb32_data_processing_plain_binary_immediate.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_plain_binary_immediate.cpp @@ -3,10 +3,10 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include "common/assert.h" -#include "common/bit_util.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { static IR::U32 Pack2x16To1x32(A32::IREmitter& ir, IR::U32 lo, IR::U32 hi) { diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_register.cpp similarity index 98% rename from src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_register.cpp index 63141b81..3427e021 100644 --- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_register.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { namespace { @@ -26,7 +26,7 @@ bool ShiftInstruction(TranslatorVisitor& v, Reg m, Reg d, Reg s, bool S, ShiftFu if (S) { v.ir.SetNFlag(v.ir.MostSignificantBit(result_carry.result)); v.ir.SetZFlag(v.ir.IsZero(result_carry.result)); - v.ir.SetCFlag(result_carry.carry); + v.ir.SetCFlag(result_carry.carry); } v.ir.SetRegister(d, result_carry.result); diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp similarity index 99% rename from src/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp index 78dda1e4..fb064d32 100644 --- a/src/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/thumb32_load_byte.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_byte.cpp similarity index 98% rename from src/frontend/A32/translate/impl/thumb32_load_byte.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_load_byte.cpp index e988e0fc..8932f308 100644 --- a/src/frontend/A32/translate/impl/thumb32_load_byte.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_byte.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include +#include "dynarmic/interface/A32/config.h" namespace Dynarmic::A32 { static bool PLDHandler(TranslatorVisitor& v, bool W) { diff --git a/src/frontend/A32/translate/impl/thumb32_load_halfword.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_halfword.cpp similarity index 98% rename from src/frontend/A32/translate/impl/thumb32_load_halfword.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_load_halfword.cpp index 3cb1585c..07a93403 100644 --- a/src/frontend/A32/translate/impl/thumb32_load_halfword.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_halfword.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/thumb32_load_store_dual.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_dual.cpp similarity index 98% rename from src/frontend/A32/translate/impl/thumb32_load_store_dual.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_dual.cpp index cdb52a98..16b24a38 100644 --- a/src/frontend/A32/translate/impl/thumb32_load_store_dual.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_dual.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include "common/bit_util.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { static bool ITBlockCheck(const A32::IREmitter& ir) { diff --git a/src/frontend/A32/translate/impl/thumb32_load_store_multiple.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_multiple.cpp similarity index 98% rename from src/frontend/A32/translate/impl/thumb32_load_store_multiple.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_multiple.cpp index 21cedff7..70895f27 100644 --- a/src/frontend/A32/translate/impl/thumb32_load_store_multiple.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_store_multiple.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include "common/bit_util.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::A32 { static bool ITBlockCheck(const A32::IREmitter& ir) { diff --git a/src/frontend/A32/translate/impl/thumb32_load_word.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_word.cpp similarity index 98% rename from src/frontend/A32/translate/impl/thumb32_load_word.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_load_word.cpp index f7d24767..d9cf5f5c 100644 --- a/src/frontend/A32/translate/impl/thumb32_load_word.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_load_word.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { static bool ITBlockCheck(const A32::IREmitter& ir) { diff --git a/src/frontend/A32/translate/impl/thumb32_long_multiply.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_long_multiply.cpp similarity index 99% rename from src/frontend/A32/translate/impl/thumb32_long_multiply.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_long_multiply.cpp index 748c10a8..2a0980ea 100644 --- a/src/frontend/A32/translate/impl/thumb32_long_multiply.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_long_multiply.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { namespace { diff --git a/src/frontend/A32/translate/impl/thumb32_misc.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_misc.cpp similarity index 98% rename from src/frontend/A32/translate/impl/thumb32_misc.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_misc.cpp index a8250449..b0703d54 100644 --- a/src/frontend/A32/translate/impl/thumb32_misc.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_misc.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/thumb32_multiply.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_multiply.cpp similarity index 99% rename from src/frontend/A32/translate/impl/thumb32_multiply.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_multiply.cpp index e654a102..ad891dbe 100644 --- a/src/frontend/A32/translate/impl/thumb32_multiply.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_multiply.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/thumb32_parallel.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_parallel.cpp similarity index 99% rename from src/frontend/A32/translate/impl/thumb32_parallel.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_parallel.cpp index 84afd845..9a74604b 100644 --- a/src/frontend/A32/translate/impl/thumb32_parallel.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_parallel.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { static IR::U32 Pack2x16To1x32(A32::IREmitter& ir, IR::U32 lo, IR::U32 hi) { diff --git a/src/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp b/src/dynarmic/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp similarity index 99% rename from src/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp rename to src/dynarmic/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp index d609e848..bc8e3c59 100644 --- a/src/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/translate.cpp b/src/dynarmic/frontend/A32/translate/impl/translate.cpp similarity index 96% rename from src/frontend/A32/translate/impl/translate.cpp rename to src/dynarmic/frontend/A32/translate/impl/translate.cpp index 5f9dc9b5..188cab35 100644 --- a/src/frontend/A32/translate/impl/translate.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/translate.cpp @@ -3,11 +3,10 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" -#include - -#include "common/assert.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/interface/A32/config.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/translate.h b/src/dynarmic/frontend/A32/translate/impl/translate.h similarity index 99% rename from src/frontend/A32/translate/impl/translate.h rename to src/dynarmic/frontend/A32/translate/impl/translate.h index 3d298310..7274f6e3 100644 --- a/src/frontend/A32/translate/impl/translate.h +++ b/src/dynarmic/frontend/A32/translate/impl/translate.h @@ -5,14 +5,14 @@ #pragma once -#include "common/assert.h" -#include "common/bit_util.h" -#include "frontend/imm.h" -#include "frontend/A32/ir_emitter.h" -#include "frontend/A32/location_descriptor.h" -#include "frontend/A32/translate/conditional_state.h" -#include "frontend/A32/translate/translate.h" -#include "frontend/A32/types.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/frontend/imm.h" +#include "dynarmic/frontend/A32/ir_emitter.h" +#include "dynarmic/frontend/A32/location_descriptor.h" +#include "dynarmic/frontend/A32/translate/conditional_state.h" +#include "dynarmic/frontend/A32/translate/translate.h" +#include "dynarmic/frontend/A32/types.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/vfp.cpp b/src/dynarmic/frontend/A32/translate/impl/vfp.cpp similarity index 99% rename from src/frontend/A32/translate/impl/vfp.cpp rename to src/dynarmic/frontend/A32/translate/impl/vfp.cpp index ea47eaa4..35237fff 100644 --- a/src/frontend/A32/translate/impl/vfp.cpp +++ b/src/dynarmic/frontend/A32/translate/impl/vfp.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" #include diff --git a/src/frontend/A32/translate/translate.cpp b/src/dynarmic/frontend/A32/translate/translate.cpp similarity index 88% rename from src/frontend/A32/translate/translate.cpp rename to src/dynarmic/frontend/A32/translate/translate.cpp index a4ee7711..932a4422 100644 --- a/src/frontend/A32/translate/translate.cpp +++ b/src/dynarmic/frontend/A32/translate/translate.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A32/location_descriptor.h" -#include "frontend/A32/translate/translate.h" -#include "ir/basic_block.h" +#include "dynarmic/frontend/A32/location_descriptor.h" +#include "dynarmic/frontend/A32/translate/translate.h" +#include "dynarmic/ir/basic_block.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/translate.h b/src/dynarmic/frontend/A32/translate/translate.h similarity index 95% rename from src/frontend/A32/translate/translate.h rename to src/dynarmic/frontend/A32/translate/translate.h index 9ab7975b..34d15a58 100644 --- a/src/frontend/A32/translate/translate.h +++ b/src/dynarmic/frontend/A32/translate/translate.h @@ -4,9 +4,8 @@ */ #pragma once -#include "common/common_types.h" - -#include +#include "dynarmic/common/common_types.h" +#include "dynarmic/interface/A32/arch_version.h" namespace Dynarmic::IR { class Block; diff --git a/src/frontend/A32/translate/translate_arm.cpp b/src/dynarmic/frontend/A32/translate/translate_arm.cpp similarity index 85% rename from src/frontend/A32/translate/translate_arm.cpp rename to src/dynarmic/frontend/A32/translate/translate_arm.cpp index b3cc5fd6..a2e796d1 100644 --- a/src/frontend/A32/translate/translate_arm.cpp +++ b/src/dynarmic/frontend/A32/translate/translate_arm.cpp @@ -3,18 +3,17 @@ * SPDX-License-Identifier: 0BSD */ -#include - -#include "common/assert.h" -#include "frontend/A32/decoder/arm.h" -#include "frontend/A32/decoder/asimd.h" -#include "frontend/A32/decoder/vfp.h" -#include "frontend/A32/location_descriptor.h" -#include "frontend/A32/translate/conditional_state.h" -#include "frontend/A32/translate/impl/translate.h" -#include "frontend/A32/translate/translate.h" -#include "frontend/A32/types.h" -#include "ir/basic_block.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/frontend/A32/decoder/arm.h" +#include "dynarmic/frontend/A32/decoder/asimd.h" +#include "dynarmic/frontend/A32/decoder/vfp.h" +#include "dynarmic/frontend/A32/location_descriptor.h" +#include "dynarmic/frontend/A32/translate/conditional_state.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/translate.h" +#include "dynarmic/frontend/A32/types.h" +#include "dynarmic/interface/A32/config.h" +#include "dynarmic/ir/basic_block.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/translate_thumb.cpp b/src/dynarmic/frontend/A32/translate/translate_thumb.cpp similarity index 91% rename from src/frontend/A32/translate/translate_thumb.cpp rename to src/dynarmic/frontend/A32/translate/translate_thumb.cpp index 99610a26..124275a8 100644 --- a/src/frontend/A32/translate/translate_thumb.cpp +++ b/src/dynarmic/frontend/A32/translate/translate_thumb.cpp @@ -5,20 +5,19 @@ #include -#include - -#include "common/assert.h" -#include "common/bit_util.h" -#include "frontend/A32/decoder/asimd.h" -#include "frontend/A32/decoder/thumb16.h" -#include "frontend/A32/decoder/thumb32.h" -#include "frontend/A32/decoder/vfp.h" -#include "frontend/A32/ir_emitter.h" -#include "frontend/A32/location_descriptor.h" -#include "frontend/A32/translate/conditional_state.h" -#include "frontend/A32/translate/impl/translate.h" -#include "frontend/A32/translate/translate.h" -#include "frontend/imm.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/frontend/A32/decoder/asimd.h" +#include "dynarmic/frontend/A32/decoder/thumb16.h" +#include "dynarmic/frontend/A32/decoder/thumb32.h" +#include "dynarmic/frontend/A32/decoder/vfp.h" +#include "dynarmic/frontend/A32/ir_emitter.h" +#include "dynarmic/frontend/A32/location_descriptor.h" +#include "dynarmic/frontend/A32/translate/conditional_state.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/translate.h" +#include "dynarmic/frontend/imm.h" +#include "dynarmic/interface/A32/config.h" namespace Dynarmic::A32 { namespace { diff --git a/src/frontend/A32/types.cpp b/src/dynarmic/frontend/A32/types.cpp similarity index 97% rename from src/frontend/A32/types.cpp rename to src/dynarmic/frontend/A32/types.cpp index 203ffa50..5d255e5b 100644 --- a/src/frontend/A32/types.cpp +++ b/src/dynarmic/frontend/A32/types.cpp @@ -6,8 +6,8 @@ #include #include -#include "common/bit_util.h" -#include "frontend/A32/types.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/frontend/A32/types.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/types.h b/src/dynarmic/frontend/A32/types.h similarity index 95% rename from src/frontend/A32/types.h rename to src/dynarmic/frontend/A32/types.h index 7e15ffc0..fb6fc21d 100644 --- a/src/frontend/A32/types.h +++ b/src/dynarmic/frontend/A32/types.h @@ -9,11 +9,10 @@ #include #include -#include - -#include "common/assert.h" -#include "common/common_types.h" -#include "ir/cond.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/interface/A32/coprocessor_util.h" +#include "dynarmic/ir/cond.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A64/decoder/a64.h b/src/dynarmic/frontend/A64/decoder/a64.h similarity index 92% rename from src/frontend/A64/decoder/a64.h rename to src/dynarmic/frontend/A64/decoder/a64.h index d3dc0cf6..a43019e7 100644 --- a/src/frontend/A64/decoder/a64.h +++ b/src/dynarmic/frontend/A64/decoder/a64.h @@ -12,10 +12,10 @@ #include #include -#include "common/bit_util.h" -#include "common/common_types.h" -#include "frontend/decoder/decoder_detail.h" -#include "frontend/decoder/matcher.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/decoder/decoder_detail.h" +#include "dynarmic/frontend/decoder/matcher.h" namespace Dynarmic::A64 { @@ -35,7 +35,7 @@ template DecodeTable GetDecodeTable() { std::vector> list = { #define INST(fn, name, bitstring) DYNARMIC_DECODER_GET_MATCHER(Matcher, fn, name, Decoder::detail::StringToArray<32>(bitstring)), -#include "a64.inc" +#include "./a64.inc" #undef INST }; diff --git a/src/frontend/A64/decoder/a64.inc b/src/dynarmic/frontend/A64/decoder/a64.inc similarity index 100% rename from src/frontend/A64/decoder/a64.inc rename to src/dynarmic/frontend/A64/decoder/a64.inc diff --git a/src/frontend/A64/ir_emitter.cpp b/src/dynarmic/frontend/A64/ir_emitter.cpp similarity index 98% rename from src/frontend/A64/ir_emitter.cpp rename to src/dynarmic/frontend/A64/ir_emitter.cpp index b4d24db7..f3aaa801 100644 --- a/src/frontend/A64/ir_emitter.cpp +++ b/src/dynarmic/frontend/A64/ir_emitter.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/assert.h" -#include "frontend/A64/ir_emitter.h" -#include "ir/opcodes.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/frontend/A64/ir_emitter.h" +#include "dynarmic/ir/opcodes.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/ir_emitter.h b/src/dynarmic/frontend/A64/ir_emitter.h similarity index 93% rename from src/frontend/A64/ir_emitter.h rename to src/dynarmic/frontend/A64/ir_emitter.h index 4f2f1cb7..a99a5068 100644 --- a/src/frontend/A64/ir_emitter.h +++ b/src/dynarmic/frontend/A64/ir_emitter.h @@ -7,13 +7,12 @@ #include -#include - -#include "common/common_types.h" -#include "frontend/A64/location_descriptor.h" -#include "frontend/A64/types.h" -#include "ir/ir_emitter.h" -#include "ir/value.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/A64/location_descriptor.h" +#include "dynarmic/frontend/A64/types.h" +#include "dynarmic/interface/A64/config.h" +#include "dynarmic/ir/ir_emitter.h" +#include "dynarmic/ir/value.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/location_descriptor.cpp b/src/dynarmic/frontend/A64/location_descriptor.cpp similarity index 88% rename from src/frontend/A64/location_descriptor.cpp rename to src/dynarmic/frontend/A64/location_descriptor.cpp index 51242493..e4d21294 100644 --- a/src/frontend/A64/location_descriptor.cpp +++ b/src/dynarmic/frontend/A64/location_descriptor.cpp @@ -6,7 +6,7 @@ #include #include -#include "frontend/A64/location_descriptor.h" +#include "dynarmic/frontend/A64/location_descriptor.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/location_descriptor.h b/src/dynarmic/frontend/A64/location_descriptor.h similarity index 95% rename from src/frontend/A64/location_descriptor.h rename to src/dynarmic/frontend/A64/location_descriptor.h index 10a4db7c..ea0fa00d 100644 --- a/src/frontend/A64/location_descriptor.h +++ b/src/dynarmic/frontend/A64/location_descriptor.h @@ -9,10 +9,10 @@ #include #include -#include "common/bit_util.h" -#include "common/common_types.h" -#include "common/fp/fpcr.h" -#include "ir/location_descriptor.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/ir/location_descriptor.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/branch.cpp b/src/dynarmic/frontend/A64/translate/impl/branch.cpp similarity index 98% rename from src/frontend/A64/translate/impl/branch.cpp rename to src/dynarmic/frontend/A64/translate/impl/branch.cpp index bc04acd4..4c5611b4 100644 --- a/src/frontend/A64/translate/impl/branch.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/branch.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/data_processing_addsub.cpp b/src/dynarmic/frontend/A64/translate/impl/data_processing_addsub.cpp similarity index 99% rename from src/frontend/A64/translate/impl/data_processing_addsub.cpp rename to src/dynarmic/frontend/A64/translate/impl/data_processing_addsub.cpp index 33fd91bf..ad706e3a 100644 --- a/src/frontend/A64/translate/impl/data_processing_addsub.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/data_processing_addsub.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/data_processing_bitfield.cpp b/src/dynarmic/frontend/A64/translate/impl/data_processing_bitfield.cpp similarity index 98% rename from src/frontend/A64/translate/impl/data_processing_bitfield.cpp rename to src/dynarmic/frontend/A64/translate/impl/data_processing_bitfield.cpp index 2ab9991e..8d6981ad 100644 --- a/src/frontend/A64/translate/impl/data_processing_bitfield.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/data_processing_bitfield.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/data_processing_conditional_compare.cpp b/src/dynarmic/frontend/A64/translate/impl/data_processing_conditional_compare.cpp similarity index 97% rename from src/frontend/A64/translate/impl/data_processing_conditional_compare.cpp rename to src/dynarmic/frontend/A64/translate/impl/data_processing_conditional_compare.cpp index 591c3cf6..f72b1fdf 100644 --- a/src/frontend/A64/translate/impl/data_processing_conditional_compare.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/data_processing_conditional_compare.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/data_processing_conditional_select.cpp b/src/dynarmic/frontend/A64/translate/impl/data_processing_conditional_select.cpp similarity index 96% rename from src/frontend/A64/translate/impl/data_processing_conditional_select.cpp rename to src/dynarmic/frontend/A64/translate/impl/data_processing_conditional_select.cpp index c2e8503f..88679d23 100644 --- a/src/frontend/A64/translate/impl/data_processing_conditional_select.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/data_processing_conditional_select.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/data_processing_crc32.cpp b/src/dynarmic/frontend/A64/translate/impl/data_processing_crc32.cpp similarity index 97% rename from src/frontend/A64/translate/impl/data_processing_crc32.cpp rename to src/dynarmic/frontend/A64/translate/impl/data_processing_crc32.cpp index 9ce80203..a690316e 100644 --- a/src/frontend/A64/translate/impl/data_processing_crc32.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/data_processing_crc32.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/data_processing_logical.cpp b/src/dynarmic/frontend/A64/translate/impl/data_processing_logical.cpp similarity index 99% rename from src/frontend/A64/translate/impl/data_processing_logical.cpp rename to src/dynarmic/frontend/A64/translate/impl/data_processing_logical.cpp index 3c1b5f35..b9fd35c2 100644 --- a/src/frontend/A64/translate/impl/data_processing_logical.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/data_processing_logical.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/data_processing_multiply.cpp b/src/dynarmic/frontend/A64/translate/impl/data_processing_multiply.cpp similarity index 97% rename from src/frontend/A64/translate/impl/data_processing_multiply.cpp rename to src/dynarmic/frontend/A64/translate/impl/data_processing_multiply.cpp index 45ad7df7..92791abf 100644 --- a/src/frontend/A64/translate/impl/data_processing_multiply.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/data_processing_multiply.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/data_processing_pcrel.cpp b/src/dynarmic/frontend/A64/translate/impl/data_processing_pcrel.cpp similarity index 91% rename from src/frontend/A64/translate/impl/data_processing_pcrel.cpp rename to src/dynarmic/frontend/A64/translate/impl/data_processing_pcrel.cpp index 07f2b5f5..05a829e9 100644 --- a/src/frontend/A64/translate/impl/data_processing_pcrel.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/data_processing_pcrel.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/data_processing_register.cpp b/src/dynarmic/frontend/A64/translate/impl/data_processing_register.cpp similarity index 98% rename from src/frontend/A64/translate/impl/data_processing_register.cpp rename to src/dynarmic/frontend/A64/translate/impl/data_processing_register.cpp index 372e0174..7b95036a 100644 --- a/src/frontend/A64/translate/impl/data_processing_register.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/data_processing_register.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/data_processing_shift.cpp b/src/dynarmic/frontend/A64/translate/impl/data_processing_shift.cpp similarity index 96% rename from src/frontend/A64/translate/impl/data_processing_shift.cpp rename to src/dynarmic/frontend/A64/translate/impl/data_processing_shift.cpp index 243ff6d9..19ef8fa9 100644 --- a/src/frontend/A64/translate/impl/data_processing_shift.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/data_processing_shift.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/exception_generating.cpp b/src/dynarmic/frontend/A64/translate/impl/exception_generating.cpp similarity index 90% rename from src/frontend/A64/translate/impl/exception_generating.cpp rename to src/dynarmic/frontend/A64/translate/impl/exception_generating.cpp index 8ea235d9..7e106bc8 100644 --- a/src/frontend/A64/translate/impl/exception_generating.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/exception_generating.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/floating_point_compare.cpp b/src/dynarmic/frontend/A64/translate/impl/floating_point_compare.cpp similarity index 95% rename from src/frontend/A64/translate/impl/floating_point_compare.cpp rename to src/dynarmic/frontend/A64/translate/impl/floating_point_compare.cpp index 80cf4694..63f18a81 100644 --- a/src/frontend/A64/translate/impl/floating_point_compare.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/floating_point_compare.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/floating_point_conditional_compare.cpp b/src/dynarmic/frontend/A64/translate/impl/floating_point_conditional_compare.cpp similarity index 95% rename from src/frontend/A64/translate/impl/floating_point_conditional_compare.cpp rename to src/dynarmic/frontend/A64/translate/impl/floating_point_conditional_compare.cpp index 329722e2..e09cca13 100644 --- a/src/frontend/A64/translate/impl/floating_point_conditional_compare.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/floating_point_conditional_compare.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/floating_point_conditional_select.cpp b/src/dynarmic/frontend/A64/translate/impl/floating_point_conditional_select.cpp similarity index 92% rename from src/frontend/A64/translate/impl/floating_point_conditional_select.cpp rename to src/dynarmic/frontend/A64/translate/impl/floating_point_conditional_select.cpp index e5d23382..4d0a6503 100644 --- a/src/frontend/A64/translate/impl/floating_point_conditional_select.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/floating_point_conditional_select.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/floating_point_conversion_fixed_point.cpp b/src/dynarmic/frontend/A64/translate/impl/floating_point_conversion_fixed_point.cpp similarity index 98% rename from src/frontend/A64/translate/impl/floating_point_conversion_fixed_point.cpp rename to src/dynarmic/frontend/A64/translate/impl/floating_point_conversion_fixed_point.cpp index 1b4eceec..e7b6b258 100644 --- a/src/frontend/A64/translate/impl/floating_point_conversion_fixed_point.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/floating_point_conversion_fixed_point.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/floating_point_conversion_integer.cpp b/src/dynarmic/frontend/A64/translate/impl/floating_point_conversion_integer.cpp similarity index 98% rename from src/frontend/A64/translate/impl/floating_point_conversion_integer.cpp rename to src/dynarmic/frontend/A64/translate/impl/floating_point_conversion_integer.cpp index 2fc15e39..0c134cb8 100644 --- a/src/frontend/A64/translate/impl/floating_point_conversion_integer.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/floating_point_conversion_integer.cpp @@ -3,8 +3,8 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/fp/rounding_mode.h" -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/common/fp/rounding_mode.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/floating_point_data_processing_one_register.cpp b/src/dynarmic/frontend/A64/translate/impl/floating_point_data_processing_one_register.cpp similarity index 99% rename from src/frontend/A64/translate/impl/floating_point_data_processing_one_register.cpp rename to src/dynarmic/frontend/A64/translate/impl/floating_point_data_processing_one_register.cpp index 49b259bb..cd611e4c 100644 --- a/src/frontend/A64/translate/impl/floating_point_data_processing_one_register.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/floating_point_data_processing_one_register.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/floating_point_data_processing_three_register.cpp b/src/dynarmic/frontend/A64/translate/impl/floating_point_data_processing_three_register.cpp similarity index 97% rename from src/frontend/A64/translate/impl/floating_point_data_processing_three_register.cpp rename to src/dynarmic/frontend/A64/translate/impl/floating_point_data_processing_three_register.cpp index 66c3c937..0c8ebcf4 100644 --- a/src/frontend/A64/translate/impl/floating_point_data_processing_three_register.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/floating_point_data_processing_three_register.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/floating_point_data_processing_two_register.cpp b/src/dynarmic/frontend/A64/translate/impl/floating_point_data_processing_two_register.cpp similarity index 98% rename from src/frontend/A64/translate/impl/floating_point_data_processing_two_register.cpp rename to src/dynarmic/frontend/A64/translate/impl/floating_point_data_processing_two_register.cpp index e29eb898..1d47df21 100644 --- a/src/frontend/A64/translate/impl/floating_point_data_processing_two_register.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/floating_point_data_processing_two_register.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/impl.cpp b/src/dynarmic/frontend/A64/translate/impl/impl.cpp similarity index 98% rename from src/frontend/A64/translate/impl/impl.cpp rename to src/dynarmic/frontend/A64/translate/impl/impl.cpp index fa2752c1..9148e159 100644 --- a/src/frontend/A64/translate/impl/impl.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/impl.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/bit_util.h" -#include "frontend/A64/translate/impl/impl.h" -#include "ir/terminal.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" +#include "dynarmic/ir/terminal.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/impl.h b/src/dynarmic/frontend/A64/translate/impl/impl.h similarity index 99% rename from src/frontend/A64/translate/impl/impl.h rename to src/dynarmic/frontend/A64/translate/impl/impl.h index e7f22136..52749d31 100644 --- a/src/frontend/A64/translate/impl/impl.h +++ b/src/dynarmic/frontend/A64/translate/impl/impl.h @@ -7,11 +7,11 @@ #include -#include "frontend/imm.h" -#include "frontend/A64/ir_emitter.h" -#include "frontend/A64/location_descriptor.h" -#include "frontend/A64/translate/translate.h" -#include "frontend/A64/types.h" +#include "dynarmic/frontend/imm.h" +#include "dynarmic/frontend/A64/ir_emitter.h" +#include "dynarmic/frontend/A64/location_descriptor.h" +#include "dynarmic/frontend/A64/translate/translate.h" +#include "dynarmic/frontend/A64/types.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/load_store_exclusive.cpp b/src/dynarmic/frontend/A64/translate/impl/load_store_exclusive.cpp similarity index 99% rename from src/frontend/A64/translate/impl/load_store_exclusive.cpp rename to src/dynarmic/frontend/A64/translate/impl/load_store_exclusive.cpp index 9c92b025..5fe2fb90 100644 --- a/src/frontend/A64/translate/impl/load_store_exclusive.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/load_store_exclusive.cpp @@ -5,7 +5,7 @@ #include -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/load_store_load_literal.cpp b/src/dynarmic/frontend/A64/translate/impl/load_store_load_literal.cpp similarity index 96% rename from src/frontend/A64/translate/impl/load_store_load_literal.cpp rename to src/dynarmic/frontend/A64/translate/impl/load_store_load_literal.cpp index 35ef7d38..a2226494 100644 --- a/src/frontend/A64/translate/impl/load_store_load_literal.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/load_store_load_literal.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/load_store_multiple_structures.cpp b/src/dynarmic/frontend/A64/translate/impl/load_store_multiple_structures.cpp similarity index 98% rename from src/frontend/A64/translate/impl/load_store_multiple_structures.cpp rename to src/dynarmic/frontend/A64/translate/impl/load_store_multiple_structures.cpp index 13aa2b48..6846c33b 100644 --- a/src/frontend/A64/translate/impl/load_store_multiple_structures.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/load_store_multiple_structures.cpp @@ -5,7 +5,7 @@ #include -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/load_store_no_allocate_pair.cpp b/src/dynarmic/frontend/A64/translate/impl/load_store_no_allocate_pair.cpp similarity index 93% rename from src/frontend/A64/translate/impl/load_store_no_allocate_pair.cpp rename to src/dynarmic/frontend/A64/translate/impl/load_store_no_allocate_pair.cpp index 8b324472..22fa35c9 100644 --- a/src/frontend/A64/translate/impl/load_store_no_allocate_pair.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/load_store_no_allocate_pair.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/load_store_register_immediate.cpp b/src/dynarmic/frontend/A64/translate/impl/load_store_register_immediate.cpp similarity index 99% rename from src/frontend/A64/translate/impl/load_store_register_immediate.cpp rename to src/dynarmic/frontend/A64/translate/impl/load_store_register_immediate.cpp index b0bfeabe..5f10946d 100644 --- a/src/frontend/A64/translate/impl/load_store_register_immediate.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/load_store_register_immediate.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/load_store_register_pair.cpp b/src/dynarmic/frontend/A64/translate/impl/load_store_register_pair.cpp similarity index 98% rename from src/frontend/A64/translate/impl/load_store_register_pair.cpp rename to src/dynarmic/frontend/A64/translate/impl/load_store_register_pair.cpp index 29cab69b..62520a78 100644 --- a/src/frontend/A64/translate/impl/load_store_register_pair.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/load_store_register_pair.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/load_store_register_register_offset.cpp b/src/dynarmic/frontend/A64/translate/impl/load_store_register_register_offset.cpp similarity index 98% rename from src/frontend/A64/translate/impl/load_store_register_register_offset.cpp rename to src/dynarmic/frontend/A64/translate/impl/load_store_register_register_offset.cpp index bdfb3c6f..9e546c95 100644 --- a/src/frontend/A64/translate/impl/load_store_register_register_offset.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/load_store_register_register_offset.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/load_store_register_unprivileged.cpp b/src/dynarmic/frontend/A64/translate/impl/load_store_register_unprivileged.cpp similarity index 98% rename from src/frontend/A64/translate/impl/load_store_register_unprivileged.cpp rename to src/dynarmic/frontend/A64/translate/impl/load_store_register_unprivileged.cpp index 4060b67d..e11bf995 100644 --- a/src/frontend/A64/translate/impl/load_store_register_unprivileged.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/load_store_register_unprivileged.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/load_store_single_structure.cpp b/src/dynarmic/frontend/A64/translate/impl/load_store_single_structure.cpp similarity index 99% rename from src/frontend/A64/translate/impl/load_store_single_structure.cpp rename to src/dynarmic/frontend/A64/translate/impl/load_store_single_structure.cpp index 4787ed47..6bea7b8b 100644 --- a/src/frontend/A64/translate/impl/load_store_single_structure.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/load_store_single_structure.cpp @@ -5,7 +5,7 @@ #include -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/move_wide.cpp b/src/dynarmic/frontend/A64/translate/impl/move_wide.cpp similarity index 96% rename from src/frontend/A64/translate/impl/move_wide.cpp rename to src/dynarmic/frontend/A64/translate/impl/move_wide.cpp index c5050f7d..cc953c44 100644 --- a/src/frontend/A64/translate/impl/move_wide.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/move_wide.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/simd_across_lanes.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_across_lanes.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_across_lanes.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_across_lanes.cpp index 62c4ef65..1946404c 100644 --- a/src/frontend/A64/translate/impl/simd_across_lanes.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_across_lanes.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_aes.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_aes.cpp similarity index 95% rename from src/frontend/A64/translate/impl/simd_aes.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_aes.cpp index 8eacd5af..d39af948 100644 --- a/src/frontend/A64/translate/impl/simd_aes.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_aes.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/simd_copy.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_copy.cpp similarity index 98% rename from src/frontend/A64/translate/impl/simd_copy.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_copy.cpp index a4a9018c..b8033091 100644 --- a/src/frontend/A64/translate/impl/simd_copy.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_copy.cpp @@ -3,8 +3,8 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/bit_util.h" -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/simd_crypto_four_register.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_crypto_four_register.cpp similarity index 96% rename from src/frontend/A64/translate/impl/simd_crypto_four_register.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_crypto_four_register.cpp index 39f068a4..c88c84a9 100644 --- a/src/frontend/A64/translate/impl/simd_crypto_four_register.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_crypto_four_register.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/simd_crypto_three_register.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_crypto_three_register.cpp similarity index 98% rename from src/frontend/A64/translate/impl/simd_crypto_three_register.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_crypto_three_register.cpp index 34c15fbd..fd0d918c 100644 --- a/src/frontend/A64/translate/impl/simd_crypto_three_register.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_crypto_three_register.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_extract.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_extract.cpp similarity index 92% rename from src/frontend/A64/translate/impl/simd_extract.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_extract.cpp index cabf6c16..ea02bad6 100644 --- a/src/frontend/A64/translate/impl/simd_extract.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_extract.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/simd_modified_immediate.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_modified_immediate.cpp similarity index 97% rename from src/frontend/A64/translate/impl/simd_modified_immediate.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_modified_immediate.cpp index 8abc7123..ef801f2b 100644 --- a/src/frontend/A64/translate/impl/simd_modified_immediate.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_modified_immediate.cpp @@ -3,8 +3,8 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/bit_util.h" -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/simd_permute.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_permute.cpp similarity index 98% rename from src/frontend/A64/translate/impl/simd_permute.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_permute.cpp index 3315f2fb..6bd1a43d 100644 --- a/src/frontend/A64/translate/impl/simd_permute.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_permute.cpp @@ -4,7 +4,7 @@ */ #include -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_scalar_pairwise.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_scalar_pairwise.cpp similarity index 97% rename from src/frontend/A64/translate/impl/simd_scalar_pairwise.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_scalar_pairwise.cpp index b9df9649..41bf991f 100644 --- a/src/frontend/A64/translate/impl/simd_scalar_pairwise.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_scalar_pairwise.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_scalar_shift_by_immediate.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_scalar_shift_by_immediate.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_scalar_shift_by_immediate.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_scalar_shift_by_immediate.cpp index b603943b..8c809e04 100644 --- a/src/frontend/A64/translate/impl/simd_scalar_shift_by_immediate.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_scalar_shift_by_immediate.cpp @@ -3,8 +3,8 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/fp/rounding_mode.h" -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/common/fp/rounding_mode.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_scalar_three_same.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_scalar_three_same.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_scalar_three_same.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_scalar_three_same.cpp index 007d0ae1..53af09cc 100644 --- a/src/frontend/A64/translate/impl/simd_scalar_three_same.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_scalar_three_same.cpp @@ -5,8 +5,8 @@ #include -#include "common/bit_util.h" -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_scalar_two_register_misc.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_scalar_two_register_misc.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_scalar_two_register_misc.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_scalar_two_register_misc.cpp index 7d9daa70..01021c85 100644 --- a/src/frontend/A64/translate/impl/simd_scalar_two_register_misc.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_scalar_two_register_misc.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_scalar_x_indexed_element.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_scalar_x_indexed_element.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_scalar_x_indexed_element.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_scalar_x_indexed_element.cpp index 5c58e4e8..84b95adb 100644 --- a/src/frontend/A64/translate/impl/simd_scalar_x_indexed_element.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_scalar_x_indexed_element.cpp @@ -4,7 +4,7 @@ */ #include -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_sha.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_sha.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_sha.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_sha.cpp index 81cfcab0..61af2f85 100644 --- a/src/frontend/A64/translate/impl/simd_sha.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_sha.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_sha512.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_sha512.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_sha512.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_sha512.cpp index 3bf70a2a..723dbfcb 100644 --- a/src/frontend/A64/translate/impl/simd_sha512.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_sha512.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_shift_by_immediate.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_shift_by_immediate.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_shift_by_immediate.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_shift_by_immediate.cpp index 5769bde7..5185b917 100644 --- a/src/frontend/A64/translate/impl/simd_shift_by_immediate.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_shift_by_immediate.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/bit_util.h" -#include "common/fp/rounding_mode.h" -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/fp/rounding_mode.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_table_lookup.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_table_lookup.cpp similarity index 95% rename from src/frontend/A64/translate/impl/simd_table_lookup.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_table_lookup.cpp index dbe8d7b8..4565fdfd 100644 --- a/src/frontend/A64/translate/impl/simd_table_lookup.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_table_lookup.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/simd_three_different.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_three_different.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_three_different.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_three_different.cpp index e4bdc347..5728c0b6 100644 --- a/src/frontend/A64/translate/impl/simd_three_different.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_three_different.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_three_same.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_three_same.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_three_same.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_three_same.cpp index 4c76d903..ade09a48 100644 --- a/src/frontend/A64/translate/impl/simd_three_same.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_three_same.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_three_same_extra.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_three_same_extra.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_three_same_extra.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_three_same_extra.cpp index f637123f..068be030 100644 --- a/src/frontend/A64/translate/impl/simd_three_same_extra.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_three_same_extra.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_two_register_misc.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_two_register_misc.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_two_register_misc.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_two_register_misc.cpp index 1927493f..0a7dbc1a 100644 --- a/src/frontend/A64/translate/impl/simd_two_register_misc.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_two_register_misc.cpp @@ -3,8 +3,8 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/fp/rounding_mode.h" -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/common/fp/rounding_mode.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/simd_vector_x_indexed_element.cpp b/src/dynarmic/frontend/A64/translate/impl/simd_vector_x_indexed_element.cpp similarity index 99% rename from src/frontend/A64/translate/impl/simd_vector_x_indexed_element.cpp rename to src/dynarmic/frontend/A64/translate/impl/simd_vector_x_indexed_element.cpp index 7862545d..1f3d58f5 100644 --- a/src/frontend/A64/translate/impl/simd_vector_x_indexed_element.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/simd_vector_x_indexed_element.cpp @@ -4,8 +4,8 @@ */ #include -#include "common/assert.h" -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { namespace { diff --git a/src/frontend/A64/translate/impl/sys_dc.cpp b/src/dynarmic/frontend/A64/translate/impl/sys_dc.cpp similarity index 96% rename from src/frontend/A64/translate/impl/sys_dc.cpp rename to src/dynarmic/frontend/A64/translate/impl/sys_dc.cpp index 4591a9e1..7b0fcda2 100644 --- a/src/frontend/A64/translate/impl/sys_dc.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/sys_dc.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/sys_ic.cpp b/src/dynarmic/frontend/A64/translate/impl/sys_ic.cpp similarity index 92% rename from src/frontend/A64/translate/impl/sys_ic.cpp rename to src/dynarmic/frontend/A64/translate/impl/sys_ic.cpp index de54121e..c06e5fa2 100644 --- a/src/frontend/A64/translate/impl/sys_ic.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/sys_ic.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/system.cpp b/src/dynarmic/frontend/A64/translate/impl/system.cpp similarity index 98% rename from src/frontend/A64/translate/impl/system.cpp rename to src/dynarmic/frontend/A64/translate/impl/system.cpp index 15a377bc..82a3793f 100644 --- a/src/frontend/A64/translate/impl/system.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/system.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/system_flag_format.cpp b/src/dynarmic/frontend/A64/translate/impl/system_flag_format.cpp similarity index 96% rename from src/frontend/A64/translate/impl/system_flag_format.cpp rename to src/dynarmic/frontend/A64/translate/impl/system_flag_format.cpp index 7fe0c400..12e3cbd1 100644 --- a/src/frontend/A64/translate/impl/system_flag_format.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/system_flag_format.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/impl/system_flag_manipulation.cpp b/src/dynarmic/frontend/A64/translate/impl/system_flag_manipulation.cpp similarity index 97% rename from src/frontend/A64/translate/impl/system_flag_manipulation.cpp rename to src/dynarmic/frontend/A64/translate/impl/system_flag_manipulation.cpp index 36f1e73b..2be76f50 100644 --- a/src/frontend/A64/translate/impl/system_flag_manipulation.cpp +++ b/src/dynarmic/frontend/A64/translate/impl/system_flag_manipulation.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/translate.cpp b/src/dynarmic/frontend/A64/translate/translate.cpp similarity index 86% rename from src/frontend/A64/translate/translate.cpp rename to src/dynarmic/frontend/A64/translate/translate.cpp index c0e1951f..aa96d481 100644 --- a/src/frontend/A64/translate/translate.cpp +++ b/src/dynarmic/frontend/A64/translate/translate.cpp @@ -3,12 +3,12 @@ * SPDX-License-Identifier: 0BSD */ -#include "frontend/A64/decoder/a64.h" -#include "frontend/A64/location_descriptor.h" -#include "frontend/A64/translate/impl/impl.h" -#include "frontend/A64/translate/translate.h" -#include "ir/basic_block.h" -#include "ir/terminal.h" +#include "dynarmic/frontend/A64/decoder/a64.h" +#include "dynarmic/frontend/A64/location_descriptor.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/translate.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/terminal.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/translate/translate.h b/src/dynarmic/frontend/A64/translate/translate.h similarity index 98% rename from src/frontend/A64/translate/translate.h rename to src/dynarmic/frontend/A64/translate/translate.h index 355b94c7..9a564348 100644 --- a/src/frontend/A64/translate/translate.h +++ b/src/dynarmic/frontend/A64/translate/translate.h @@ -6,7 +6,7 @@ #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic { diff --git a/src/frontend/A64/types.cpp b/src/dynarmic/frontend/A64/types.cpp similarity index 95% rename from src/frontend/A64/types.cpp rename to src/dynarmic/frontend/A64/types.cpp index 5f9821ab..f4047811 100644 --- a/src/frontend/A64/types.cpp +++ b/src/dynarmic/frontend/A64/types.cpp @@ -8,7 +8,7 @@ #include -#include "frontend/A64/types.h" +#include "dynarmic/frontend/A64/types.h" namespace Dynarmic::A64 { diff --git a/src/frontend/A64/types.h b/src/dynarmic/frontend/A64/types.h similarity index 92% rename from src/frontend/A64/types.h rename to src/dynarmic/frontend/A64/types.h index 56df914e..3d585221 100644 --- a/src/frontend/A64/types.h +++ b/src/dynarmic/frontend/A64/types.h @@ -8,9 +8,9 @@ #include #include -#include "common/assert.h" -#include "common/common_types.h" -#include "ir/cond.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/ir/cond.h" namespace Dynarmic::A64 { diff --git a/src/frontend/decoder/decoder_detail.h b/src/dynarmic/frontend/decoder/decoder_detail.h similarity index 98% rename from src/frontend/decoder/decoder_detail.h rename to src/dynarmic/frontend/decoder/decoder_detail.h index 124b1f57..1091dd70 100644 --- a/src/frontend/decoder/decoder_detail.h +++ b/src/dynarmic/frontend/decoder/decoder_detail.h @@ -11,8 +11,8 @@ #include -#include "common/assert.h" -#include "common/bit_util.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" namespace Dynarmic::Decoder { namespace detail { diff --git a/src/frontend/decoder/matcher.h b/src/dynarmic/frontend/decoder/matcher.h similarity index 98% rename from src/frontend/decoder/matcher.h rename to src/dynarmic/frontend/decoder/matcher.h index 0d6f9f08..46052c3b 100644 --- a/src/frontend/decoder/matcher.h +++ b/src/dynarmic/frontend/decoder/matcher.h @@ -7,7 +7,7 @@ #include -#include "common/assert.h" +#include "dynarmic/common/assert.h" namespace Dynarmic::Decoder { diff --git a/src/frontend/imm.cpp b/src/dynarmic/frontend/imm.cpp similarity index 94% rename from src/frontend/imm.cpp rename to src/dynarmic/frontend/imm.cpp index 282ff911..0bd305c1 100644 --- a/src/frontend/imm.cpp +++ b/src/dynarmic/frontend/imm.cpp @@ -3,10 +3,10 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/common_types.h" -#include "frontend/imm.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/imm.h" namespace Dynarmic { diff --git a/src/frontend/imm.h b/src/dynarmic/frontend/imm.h similarity index 96% rename from src/frontend/imm.h rename to src/dynarmic/frontend/imm.h index cde09902..d05c9f7c 100644 --- a/src/frontend/imm.h +++ b/src/dynarmic/frontend/imm.h @@ -5,10 +5,10 @@ #pragma once -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/common_types.h" -#include "common/math_util.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/math_util.h" namespace Dynarmic { diff --git a/include/dynarmic/A32/a32.h b/src/dynarmic/interface/A32/a32.h similarity index 98% rename from include/dynarmic/A32/a32.h rename to src/dynarmic/interface/A32/a32.h index 2066b1a2..c8db60fe 100644 --- a/include/dynarmic/A32/a32.h +++ b/src/dynarmic/interface/A32/a32.h @@ -10,7 +10,7 @@ #include #include -#include +#include "dynarmic/interface/A32/config.h" namespace Dynarmic { namespace A32 { diff --git a/include/dynarmic/A32/arch_version.h b/src/dynarmic/interface/A32/arch_version.h similarity index 100% rename from include/dynarmic/A32/arch_version.h rename to src/dynarmic/interface/A32/arch_version.h diff --git a/include/dynarmic/A32/config.h b/src/dynarmic/interface/A32/config.h similarity index 98% rename from include/dynarmic/A32/config.h rename to src/dynarmic/interface/A32/config.h index a64cf737..33bdb0c3 100644 --- a/include/dynarmic/A32/config.h +++ b/src/dynarmic/interface/A32/config.h @@ -10,8 +10,8 @@ #include #include -#include -#include +#include "dynarmic/interface/A32/arch_version.h" +#include "dynarmic/interface/optimization_flags.h" namespace Dynarmic { class ExclusiveMonitor; diff --git a/include/dynarmic/A32/context.h b/src/dynarmic/interface/A32/context.h similarity index 100% rename from include/dynarmic/A32/context.h rename to src/dynarmic/interface/A32/context.h diff --git a/include/dynarmic/A32/coprocessor.h b/src/dynarmic/interface/A32/coprocessor.h similarity index 98% rename from include/dynarmic/A32/coprocessor.h rename to src/dynarmic/interface/A32/coprocessor.h index 017fe697..0b69891c 100644 --- a/include/dynarmic/A32/coprocessor.h +++ b/src/dynarmic/interface/A32/coprocessor.h @@ -9,7 +9,7 @@ #include #include -#include +#include "dynarmic/interface/A32/coprocessor_util.h" namespace Dynarmic { namespace A32 { diff --git a/include/dynarmic/A32/coprocessor_util.h b/src/dynarmic/interface/A32/coprocessor_util.h similarity index 100% rename from include/dynarmic/A32/coprocessor_util.h rename to src/dynarmic/interface/A32/coprocessor_util.h diff --git a/include/dynarmic/A32/disassembler.h b/src/dynarmic/interface/A32/disassembler.h similarity index 100% rename from include/dynarmic/A32/disassembler.h rename to src/dynarmic/interface/A32/disassembler.h diff --git a/include/dynarmic/A64/a64.h b/src/dynarmic/interface/A64/a64.h similarity index 98% rename from include/dynarmic/A64/a64.h rename to src/dynarmic/interface/A64/a64.h index f51f6fad..541b449d 100644 --- a/include/dynarmic/A64/a64.h +++ b/src/dynarmic/interface/A64/a64.h @@ -11,7 +11,7 @@ #include #include -#include +#include "dynarmic/interface/A64/config.h" namespace Dynarmic { namespace A64 { diff --git a/include/dynarmic/A64/config.h b/src/dynarmic/interface/A64/config.h similarity index 99% rename from include/dynarmic/A64/config.h rename to src/dynarmic/interface/A64/config.h index 7249c6fa..6bc8bd41 100644 --- a/include/dynarmic/A64/config.h +++ b/src/dynarmic/interface/A64/config.h @@ -10,7 +10,7 @@ #include #include -#include +#include "dynarmic/interface/optimization_flags.h" namespace Dynarmic { class ExclusiveMonitor; diff --git a/include/dynarmic/exclusive_monitor.h b/src/dynarmic/interface/exclusive_monitor.h similarity index 100% rename from include/dynarmic/exclusive_monitor.h rename to src/dynarmic/interface/exclusive_monitor.h diff --git a/include/dynarmic/optimization_flags.h b/src/dynarmic/interface/optimization_flags.h similarity index 100% rename from include/dynarmic/optimization_flags.h rename to src/dynarmic/interface/optimization_flags.h diff --git a/src/ir/basic_block.cpp b/src/dynarmic/ir/basic_block.cpp similarity index 96% rename from src/ir/basic_block.cpp rename to src/dynarmic/ir/basic_block.cpp index c561345c..07d39f2d 100644 --- a/src/ir/basic_block.cpp +++ b/src/dynarmic/ir/basic_block.cpp @@ -11,13 +11,13 @@ #include #include -#include "common/assert.h" -#include "common/memory_pool.h" -#include "frontend/A32/types.h" -#include "frontend/A64/types.h" -#include "ir/basic_block.h" -#include "ir/cond.h" -#include "ir/opcodes.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/memory_pool.h" +#include "dynarmic/frontend/A32/types.h" +#include "dynarmic/frontend/A64/types.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/cond.h" +#include "dynarmic/ir/opcodes.h" namespace Dynarmic::IR { diff --git a/src/ir/basic_block.h b/src/dynarmic/ir/basic_block.h similarity index 96% rename from src/ir/basic_block.h rename to src/dynarmic/ir/basic_block.h index 969093eb..73f7324f 100644 --- a/src/ir/basic_block.h +++ b/src/dynarmic/ir/basic_block.h @@ -10,12 +10,12 @@ #include #include -#include "common/common_types.h" -#include "common/intrusive_list.h" -#include "ir/location_descriptor.h" -#include "ir/microinstruction.h" -#include "ir/terminal.h" -#include "ir/value.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/intrusive_list.h" +#include "dynarmic/ir/location_descriptor.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/ir/terminal.h" +#include "dynarmic/ir/value.h" namespace Dynarmic::Common { class Pool; diff --git a/src/ir/cond.h b/src/dynarmic/ir/cond.h similarity index 100% rename from src/ir/cond.h rename to src/dynarmic/ir/cond.h diff --git a/src/ir/ir_emitter.cpp b/src/dynarmic/ir/ir_emitter.cpp similarity index 99% rename from src/ir/ir_emitter.cpp rename to src/dynarmic/ir/ir_emitter.cpp index 9810ad7f..fcd36ed2 100644 --- a/src/ir/ir_emitter.cpp +++ b/src/dynarmic/ir/ir_emitter.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/assert.h" -#include "ir/ir_emitter.h" -#include "ir/opcodes.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/ir/ir_emitter.h" +#include "dynarmic/ir/opcodes.h" namespace Dynarmic::IR { diff --git a/src/ir/ir_emitter.h b/src/dynarmic/ir/ir_emitter.h similarity index 99% rename from src/ir/ir_emitter.h rename to src/dynarmic/ir/ir_emitter.h index 7b55c9d4..6687c18c 100644 --- a/src/ir/ir_emitter.h +++ b/src/dynarmic/ir/ir_emitter.h @@ -5,11 +5,11 @@ #pragma once -#include "common/common_types.h" -#include "ir/basic_block.h" -#include "ir/location_descriptor.h" -#include "ir/terminal.h" -#include "ir/value.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/location_descriptor.h" +#include "dynarmic/ir/terminal.h" +#include "dynarmic/ir/value.h" namespace Dynarmic::FP { enum class RoundingMode; diff --git a/src/ir/location_descriptor.cpp b/src/dynarmic/ir/location_descriptor.cpp similarity index 89% rename from src/ir/location_descriptor.cpp rename to src/dynarmic/ir/location_descriptor.cpp index ce6faaeb..38f40657 100644 --- a/src/ir/location_descriptor.cpp +++ b/src/dynarmic/ir/location_descriptor.cpp @@ -6,7 +6,7 @@ #include #include -#include "ir/location_descriptor.h" +#include "dynarmic/ir/location_descriptor.h" namespace Dynarmic::IR { diff --git a/src/ir/location_descriptor.h b/src/dynarmic/ir/location_descriptor.h similarity index 96% rename from src/ir/location_descriptor.h rename to src/dynarmic/ir/location_descriptor.h index a4bfc554..e253d15d 100644 --- a/src/ir/location_descriptor.h +++ b/src/dynarmic/ir/location_descriptor.h @@ -8,7 +8,7 @@ #include #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::IR { diff --git a/src/ir/microinstruction.cpp b/src/dynarmic/ir/microinstruction.cpp similarity index 99% rename from src/ir/microinstruction.cpp rename to src/dynarmic/ir/microinstruction.cpp index 12283ac3..439ffa68 100644 --- a/src/ir/microinstruction.cpp +++ b/src/dynarmic/ir/microinstruction.cpp @@ -7,10 +7,10 @@ #include -#include "common/assert.h" -#include "ir/microinstruction.h" -#include "ir/opcodes.h" -#include "ir/type.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/ir/opcodes.h" +#include "dynarmic/ir/type.h" namespace Dynarmic::IR { diff --git a/src/ir/microinstruction.h b/src/dynarmic/ir/microinstruction.h similarity index 98% rename from src/ir/microinstruction.h rename to src/dynarmic/ir/microinstruction.h index e712e15d..433e6bdd 100644 --- a/src/ir/microinstruction.h +++ b/src/dynarmic/ir/microinstruction.h @@ -7,9 +7,9 @@ #include -#include "common/common_types.h" -#include "common/intrusive_list.h" -#include "ir/value.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/intrusive_list.h" +#include "dynarmic/ir/value.h" namespace Dynarmic::IR { diff --git a/src/ir/opcodes.cpp b/src/dynarmic/ir/opcodes.cpp similarity index 95% rename from src/ir/opcodes.cpp rename to src/dynarmic/ir/opcodes.cpp index 64e0c5f7..b2f8aaa4 100644 --- a/src/ir/opcodes.cpp +++ b/src/dynarmic/ir/opcodes.cpp @@ -11,8 +11,8 @@ #include #include -#include "ir/opcodes.h" -#include "ir/type.h" +#include "dynarmic/ir/opcodes.h" +#include "dynarmic/ir/type.h" namespace Dynarmic::IR { @@ -47,7 +47,7 @@ static const std::array opcode_info { #define OPCODE(name, type, ...) Meta{#name, type, {__VA_ARGS__}}, #define A32OPC(name, type, ...) Meta{#name, type, {__VA_ARGS__}}, #define A64OPC(name, type, ...) Meta{#name, type, {__VA_ARGS__}}, -#include "opcodes.inc" +#include "./opcodes.inc" #undef OPCODE #undef A32OPC #undef A64OPC diff --git a/src/ir/opcodes.h b/src/dynarmic/ir/opcodes.h similarity index 93% rename from src/ir/opcodes.h rename to src/dynarmic/ir/opcodes.h index 14e31b50..f0c3f442 100644 --- a/src/ir/opcodes.h +++ b/src/dynarmic/ir/opcodes.h @@ -8,7 +8,7 @@ #include #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::IR { @@ -22,7 +22,7 @@ enum class Opcode { #define OPCODE(name, type, ...) name, #define A32OPC(name, type, ...) A32##name, #define A64OPC(name, type, ...) A64##name, -#include "opcodes.inc" +#include "./opcodes.inc" #undef OPCODE #undef A32OPC #undef A64OPC diff --git a/src/ir/opcodes.inc b/src/dynarmic/ir/opcodes.inc similarity index 100% rename from src/ir/opcodes.inc rename to src/dynarmic/ir/opcodes.inc diff --git a/src/ir/opt/a32_constant_memory_reads_pass.cpp b/src/dynarmic/ir/opt/a32_constant_memory_reads_pass.cpp similarity index 93% rename from src/ir/opt/a32_constant_memory_reads_pass.cpp rename to src/dynarmic/ir/opt/a32_constant_memory_reads_pass.cpp index 9ffb07e9..f8bb291e 100644 --- a/src/ir/opt/a32_constant_memory_reads_pass.cpp +++ b/src/dynarmic/ir/opt/a32_constant_memory_reads_pass.cpp @@ -3,11 +3,10 @@ * SPDX-License-Identifier: 0BSD */ -#include - -#include "ir/basic_block.h" -#include "ir/opcodes.h" -#include "ir/opt/passes.h" +#include "dynarmic/interface/A32/config.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/opcodes.h" +#include "dynarmic/ir/opt/passes.h" namespace Dynarmic::Optimization { diff --git a/src/ir/opt/a32_get_set_elimination_pass.cpp b/src/dynarmic/ir/opt/a32_get_set_elimination_pass.cpp similarity index 96% rename from src/ir/opt/a32_get_set_elimination_pass.cpp rename to src/dynarmic/ir/opt/a32_get_set_elimination_pass.cpp index bc3e7948..cb6d8328 100644 --- a/src/ir/opt/a32_get_set_elimination_pass.cpp +++ b/src/dynarmic/ir/opt/a32_get_set_elimination_pass.cpp @@ -5,13 +5,13 @@ #include -#include "common/assert.h" -#include "common/common_types.h" -#include "frontend/A32/types.h" -#include "ir/basic_block.h" -#include "ir/opcodes.h" -#include "ir/opt/passes.h" -#include "ir/value.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/A32/types.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/opcodes.h" +#include "dynarmic/ir/opt/passes.h" +#include "dynarmic/ir/value.h" namespace Dynarmic::Optimization { diff --git a/src/ir/opt/a64_callback_config_pass.cpp b/src/dynarmic/ir/opt/a64_callback_config_pass.cpp similarity index 86% rename from src/ir/opt/a64_callback_config_pass.cpp rename to src/dynarmic/ir/opt/a64_callback_config_pass.cpp index 7a92e33c..8149be47 100644 --- a/src/ir/opt/a64_callback_config_pass.cpp +++ b/src/dynarmic/ir/opt/a64_callback_config_pass.cpp @@ -3,13 +3,12 @@ * SPDX-License-Identifier: 0BSD */ -#include - -#include "frontend/A64/ir_emitter.h" -#include "ir/basic_block.h" -#include "ir/microinstruction.h" -#include "ir/opcodes.h" -#include "ir/opt/passes.h" +#include "dynarmic/frontend/A64/ir_emitter.h" +#include "dynarmic/interface/A64/config.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/ir/opcodes.h" +#include "dynarmic/ir/opt/passes.h" namespace Dynarmic::Optimization { diff --git a/src/ir/opt/a64_get_set_elimination_pass.cpp b/src/dynarmic/ir/opt/a64_get_set_elimination_pass.cpp similarity index 95% rename from src/ir/opt/a64_get_set_elimination_pass.cpp rename to src/dynarmic/ir/opt/a64_get_set_elimination_pass.cpp index 6b549ede..7e0ad7c3 100644 --- a/src/ir/opt/a64_get_set_elimination_pass.cpp +++ b/src/dynarmic/ir/opt/a64_get_set_elimination_pass.cpp @@ -5,12 +5,12 @@ #include -#include "common/common_types.h" -#include "frontend/A64/types.h" -#include "ir/basic_block.h" -#include "ir/opcodes.h" -#include "ir/opt/passes.h" -#include "ir/value.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/A64/types.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/opcodes.h" +#include "dynarmic/ir/opt/passes.h" +#include "dynarmic/ir/value.h" namespace Dynarmic::Optimization { diff --git a/src/ir/opt/a64_merge_interpret_blocks.cpp b/src/dynarmic/ir/opt/a64_merge_interpret_blocks.cpp similarity index 83% rename from src/ir/opt/a64_merge_interpret_blocks.cpp rename to src/dynarmic/ir/opt/a64_merge_interpret_blocks.cpp index 0653978e..a888c00f 100644 --- a/src/ir/opt/a64_merge_interpret_blocks.cpp +++ b/src/dynarmic/ir/opt/a64_merge_interpret_blocks.cpp @@ -4,13 +4,13 @@ */ #include -#include -#include "common/common_types.h" -#include "frontend/A64/location_descriptor.h" -#include "frontend/A64/translate/translate.h" -#include "ir/basic_block.h" -#include "ir/opt/passes.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/A64/location_descriptor.h" +#include "dynarmic/frontend/A64/translate/translate.h" +#include "dynarmic/interface/A64/config.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/opt/passes.h" namespace Dynarmic::Optimization { diff --git a/src/ir/opt/constant_propagation_pass.cpp b/src/dynarmic/ir/opt/constant_propagation_pass.cpp similarity index 98% rename from src/ir/opt/constant_propagation_pass.cpp rename to src/dynarmic/ir/opt/constant_propagation_pass.cpp index 81953dea..aef06bc5 100644 --- a/src/ir/opt/constant_propagation_pass.cpp +++ b/src/dynarmic/ir/opt/constant_propagation_pass.cpp @@ -5,14 +5,14 @@ #include -#include "common/assert.h" -#include "common/bit_util.h" -#include "common/common_types.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" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/safe_ops.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/ir_emitter.h" +#include "dynarmic/ir/opcodes.h" +#include "dynarmic/ir/opt/passes.h" namespace Dynarmic::Optimization { diff --git a/src/ir/opt/dead_code_elimination_pass.cpp b/src/dynarmic/ir/opt/dead_code_elimination_pass.cpp similarity index 82% rename from src/ir/opt/dead_code_elimination_pass.cpp rename to src/dynarmic/ir/opt/dead_code_elimination_pass.cpp index 9952d470..9513d297 100644 --- a/src/ir/opt/dead_code_elimination_pass.cpp +++ b/src/dynarmic/ir/opt/dead_code_elimination_pass.cpp @@ -3,9 +3,9 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/iterator_util.h" -#include "ir/basic_block.h" -#include "ir/opt/passes.h" +#include "dynarmic/common/iterator_util.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/opt/passes.h" namespace Dynarmic::Optimization { diff --git a/src/ir/opt/identity_removal_pass.cpp b/src/dynarmic/ir/opt/identity_removal_pass.cpp similarity index 87% rename from src/ir/opt/identity_removal_pass.cpp rename to src/dynarmic/ir/opt/identity_removal_pass.cpp index 844678b2..9cb3c793 100644 --- a/src/ir/opt/identity_removal_pass.cpp +++ b/src/dynarmic/ir/opt/identity_removal_pass.cpp @@ -5,10 +5,10 @@ #include -#include "common/iterator_util.h" -#include "ir/basic_block.h" -#include "ir/opcodes.h" -#include "ir/opt/passes.h" +#include "dynarmic/common/iterator_util.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/opcodes.h" +#include "dynarmic/ir/opt/passes.h" namespace Dynarmic::Optimization { diff --git a/src/ir/opt/ir_matcher.h b/src/dynarmic/ir/opt/ir_matcher.h similarity index 96% rename from src/ir/opt/ir_matcher.h rename to src/dynarmic/ir/opt/ir_matcher.h index 2e58fa95..ce1ff300 100644 --- a/src/ir/opt/ir_matcher.h +++ b/src/dynarmic/ir/opt/ir_matcher.h @@ -16,9 +16,9 @@ #include #include -#include "ir/microinstruction.h" -#include "ir/opcodes.h" -#include "ir/value.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/ir/opcodes.h" +#include "dynarmic/ir/value.h" namespace Dynarmic::Optimization::IRMatcher { diff --git a/src/ir/opt/passes.h b/src/dynarmic/ir/opt/passes.h similarity index 100% rename from src/ir/opt/passes.h rename to src/dynarmic/ir/opt/passes.h diff --git a/src/ir/opt/verification_pass.cpp b/src/dynarmic/ir/opt/verification_pass.cpp similarity index 81% rename from src/ir/opt/verification_pass.cpp rename to src/dynarmic/ir/opt/verification_pass.cpp index 87010526..7a1a0390 100644 --- a/src/ir/opt/verification_pass.cpp +++ b/src/dynarmic/ir/opt/verification_pass.cpp @@ -6,13 +6,13 @@ #include #include -#include "common/assert.h" -#include "common/common_types.h" -#include "ir/basic_block.h" -#include "ir/microinstruction.h" -#include "ir/opcodes.h" -#include "ir/opt/passes.h" -#include "ir/type.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/ir/opcodes.h" +#include "dynarmic/ir/opt/passes.h" +#include "dynarmic/ir/type.h" namespace Dynarmic::Optimization { diff --git a/src/ir/terminal.h b/src/dynarmic/ir/terminal.h similarity index 97% rename from src/ir/terminal.h rename to src/dynarmic/ir/terminal.h index d7c03197..ab8a90e1 100644 --- a/src/ir/terminal.h +++ b/src/dynarmic/ir/terminal.h @@ -7,9 +7,9 @@ #include -#include "common/common_types.h" -#include "ir/cond.h" -#include "ir/location_descriptor.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/ir/cond.h" +#include "dynarmic/ir/location_descriptor.h" namespace Dynarmic::IR { namespace Term { diff --git a/src/ir/type.cpp b/src/dynarmic/ir/type.cpp similarity index 97% rename from src/ir/type.cpp rename to src/dynarmic/ir/type.cpp index 810c5514..9c9ceba2 100644 --- a/src/ir/type.cpp +++ b/src/dynarmic/ir/type.cpp @@ -7,7 +7,7 @@ #include #include -#include "ir/type.h" +#include "dynarmic/ir/type.h" namespace Dynarmic::IR { diff --git a/src/ir/type.h b/src/dynarmic/ir/type.h similarity index 96% rename from src/ir/type.h rename to src/dynarmic/ir/type.h index 459b7891..a7d1c7c6 100644 --- a/src/ir/type.h +++ b/src/dynarmic/ir/type.h @@ -8,7 +8,7 @@ #include #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" namespace Dynarmic::IR { diff --git a/src/ir/value.cpp b/src/dynarmic/ir/value.cpp similarity index 95% rename from src/ir/value.cpp rename to src/dynarmic/ir/value.cpp index 82ca7d20..d809470f 100644 --- a/src/ir/value.cpp +++ b/src/dynarmic/ir/value.cpp @@ -3,12 +3,12 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/assert.h" -#include "common/bit_util.h" -#include "ir/microinstruction.h" -#include "ir/opcodes.h" -#include "ir/type.h" -#include "ir/value.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/ir/microinstruction.h" +#include "dynarmic/ir/opcodes.h" +#include "dynarmic/ir/type.h" +#include "dynarmic/ir/value.h" namespace Dynarmic::IR { diff --git a/src/ir/value.h b/src/dynarmic/ir/value.h similarity index 97% rename from src/ir/value.h rename to src/dynarmic/ir/value.h index 9342c8ab..b6031749 100644 --- a/src/ir/value.h +++ b/src/dynarmic/ir/value.h @@ -7,9 +7,9 @@ #include -#include "common/assert.h" -#include "common/common_types.h" -#include "ir/type.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/ir/type.h" namespace Dynarmic::A32 { enum class ExtReg; diff --git a/tests/A32/fuzz_arm.cpp b/tests/A32/fuzz_arm.cpp index 9a73a32d..19dae24b 100644 --- a/tests/A32/fuzz_arm.cpp +++ b/tests/A32/fuzz_arm.cpp @@ -11,24 +11,24 @@ #include #include -#include -#include "common/common_types.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/llvm_disassemble.h" -#include "common/scope_exit.h" -#include "frontend/A32/ITState.h" -#include "frontend/A32/location_descriptor.h" -#include "frontend/A32/translate/translate.h" -#include "frontend/A32/types.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" +#include "../fuzz_util.h" +#include "../rand_int.h" +#include "../unicorn_emu/a32_unicorn.h" +#include "./testenv.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/llvm_disassemble.h" +#include "dynarmic/common/scope_exit.h" +#include "dynarmic/frontend/A32/ITState.h" +#include "dynarmic/frontend/A32/location_descriptor.h" +#include "dynarmic/frontend/A32/translate/translate.h" +#include "dynarmic/frontend/A32/types.h" +#include "dynarmic/interface/A32/a32.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/location_descriptor.h" +#include "dynarmic/ir/opcodes.h" // Must be declared last for all necessary operator<< to be declared prior to this. #include @@ -82,9 +82,9 @@ u32 GenRandomArmInst(u32 pc, bool is_last_inst) { } instructions = []{ const std::vector> list { #define INST(fn, name, bitstring) {#fn, bitstring}, -#include "frontend/A32/decoder/arm.inc" -#include "frontend/A32/decoder/asimd.inc" -#include "frontend/A32/decoder/vfp.inc" +#include "dynarmic/frontend/A32/decoder/arm.inc" +#include "dynarmic/frontend/A32/decoder/asimd.inc" +#include "dynarmic/frontend/A32/decoder/vfp.inc" #undef INST }; @@ -153,20 +153,20 @@ std::vector GenRandomThumbInst(u32 pc, bool is_last_inst, A32::ITState it_s } instructions = []{ const std::vector> list { #define INST(fn, name, bitstring) {#fn, bitstring}, -#include "frontend/A32/decoder/thumb16.inc" -#include "frontend/A32/decoder/thumb32.inc" +#include "dynarmic/frontend/A32/decoder/thumb16.inc" +#include "dynarmic/frontend/A32/decoder/thumb32.inc" #undef INST }; const std::vector> vfp_list { #define INST(fn, name, bitstring) {#fn, bitstring}, -#include "frontend/A32/decoder/vfp.inc" +#include "dynarmic/frontend/A32/decoder/vfp.inc" #undef INST }; const std::vector> asimd_list { #define INST(fn, name, bitstring) {#fn, bitstring}, -#include "frontend/A32/decoder/asimd.inc" +#include "dynarmic/frontend/A32/decoder/asimd.inc" #undef INST }; diff --git a/tests/A32/fuzz_thumb.cpp b/tests/A32/fuzz_thumb.cpp index 49f5e6b3..9ac46fd1 100644 --- a/tests/A32/fuzz_thumb.cpp +++ b/tests/A32/fuzz_thumb.cpp @@ -14,20 +14,19 @@ #include -#include - -#include "common/bit_util.h" -#include "common/common_types.h" -#include "frontend/A32/disassembler/disassembler.h" -#include "frontend/A32/FPSCR.h" -#include "frontend/A32/location_descriptor.h" -#include "frontend/A32/PSR.h" -#include "frontend/A32/translate/translate.h" -#include "ir/basic_block.h" -#include "ir/opt/passes.h" -#include "rand_int.h" -#include "testenv.h" -#include "unicorn_emu/a32_unicorn.h" +#include "../rand_int.h" +#include "../unicorn_emu/a32_unicorn.h" +#include "./testenv.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/frontend/A32/disassembler/disassembler.h" +#include "dynarmic/frontend/A32/FPSCR.h" +#include "dynarmic/frontend/A32/location_descriptor.h" +#include "dynarmic/frontend/A32/PSR.h" +#include "dynarmic/frontend/A32/translate/translate.h" +#include "dynarmic/interface/A32/a32.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/opt/passes.h" using namespace Dynarmic; diff --git a/tests/A32/test_arm_disassembler.cpp b/tests/A32/test_arm_disassembler.cpp index 4e4b0bad..f4fe9b80 100644 --- a/tests/A32/test_arm_disassembler.cpp +++ b/tests/A32/test_arm_disassembler.cpp @@ -5,7 +5,7 @@ #include -#include "frontend/A32/disassembler/disassembler.h" +#include "dynarmic/frontend/A32/disassembler/disassembler.h" using Dynarmic::A32::DisassembleArm; diff --git a/tests/A32/test_arm_instructions.cpp b/tests/A32/test_arm_instructions.cpp index c8e5eac4..ec8aa1a8 100644 --- a/tests/A32/test_arm_instructions.cpp +++ b/tests/A32/test_arm_instructions.cpp @@ -4,10 +4,10 @@ */ #include -#include -#include "A32/testenv.h" -#include "frontend/A32/location_descriptor.h" +#include "./testenv.h" +#include "dynarmic/frontend/A32/location_descriptor.h" +#include "dynarmic/interface/A32/a32.h" using namespace Dynarmic; diff --git a/tests/A32/test_thumb_instructions.cpp b/tests/A32/test_thumb_instructions.cpp index 46169839..a7dbd1f3 100644 --- a/tests/A32/test_thumb_instructions.cpp +++ b/tests/A32/test_thumb_instructions.cpp @@ -5,10 +5,9 @@ #include -#include - -#include "common/common_types.h" -#include "testenv.h" +#include "./testenv.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/interface/A32/a32.h" static Dynarmic::A32::UserConfig GetUserConfig(ThumbTestEnv* testenv) { Dynarmic::A32::UserConfig user_config; diff --git a/tests/A32/testenv.h b/tests/A32/testenv.h index 1ff0066c..a71cc188 100644 --- a/tests/A32/testenv.h +++ b/tests/A32/testenv.h @@ -11,10 +11,9 @@ #include #include -#include - -#include "common/assert.h" -#include "common/common_types.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/interface/A32/a32.h" template class A32TestEnv final : public Dynarmic::A32::UserCallbacks { diff --git a/tests/A64/a64.cpp b/tests/A64/a64.cpp index 9e28c73b..25dbc261 100644 --- a/tests/A64/a64.cpp +++ b/tests/A64/a64.cpp @@ -5,10 +5,9 @@ #include -#include - -#include "common/fp/fpsr.h" -#include "testenv.h" +#include "./testenv.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/interface/exclusive_monitor.h" using namespace Dynarmic; diff --git a/tests/A64/fuzz_with_unicorn.cpp b/tests/A64/fuzz_with_unicorn.cpp index e32f606a..ae01c40c 100644 --- a/tests/A64/fuzz_with_unicorn.cpp +++ b/tests/A64/fuzz_with_unicorn.cpp @@ -10,22 +10,22 @@ #include -#include "common/common_types.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/llvm_disassemble.h" -#include "common/scope_exit.h" -#include "frontend/A64/decoder/a64.h" -#include "frontend/A64/location_descriptor.h" -#include "frontend/A64/translate/translate.h" -#include "frontend/A64/types.h" -#include "fuzz_util.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" +#include "../fuzz_util.h" +#include "../rand_int.h" +#include "../unicorn_emu/a64_unicorn.h" +#include "./testenv.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/llvm_disassemble.h" +#include "dynarmic/common/scope_exit.h" +#include "dynarmic/frontend/A64/decoder/a64.h" +#include "dynarmic/frontend/A64/location_descriptor.h" +#include "dynarmic/frontend/A64/translate/translate.h" +#include "dynarmic/frontend/A64/types.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/opcodes.h" +#include "dynarmic/ir/opt/passes.h" // Must be declared last for all necessary operator<< to be declared prior to this. #include @@ -62,7 +62,7 @@ static u32 GenRandomInst(u64 pc, bool is_last_inst) { } instructions = []{ const std::vector> list { #define INST(fn, name, bitstring) {#fn, bitstring}, -#include "frontend/A64/decoder/a64.inc" +#include "dynarmic/frontend/A64/decoder/a64.inc" #undef INST }; @@ -111,7 +111,7 @@ static u32 GenFloatInst(u64 pc, bool is_last_inst) { static const std::vector instruction_generators = []{ const std::vector> list { #define INST(fn, name, bitstring) {#fn, #name, bitstring}, -#include "frontend/A64/decoder/a64.inc" +#include "dynarmic/frontend/A64/decoder/a64.inc" #undef INST }; diff --git a/tests/A64/misaligned_page_table.cpp b/tests/A64/misaligned_page_table.cpp index 45633764..21662de5 100644 --- a/tests/A64/misaligned_page_table.cpp +++ b/tests/A64/misaligned_page_table.cpp @@ -5,9 +5,8 @@ #include -#include - -#include "testenv.h" +#include "./testenv.h" +#include "dynarmic/interface/A64/a64.h" TEST_CASE("misaligned load/store do not use page_table when detect_misaligned_access_via_page_table is set", "[a64]") { A64TestEnv env; diff --git a/tests/A64/testenv.h b/tests/A64/testenv.h index 0eaf68ed..c7c891fb 100644 --- a/tests/A64/testenv.h +++ b/tests/A64/testenv.h @@ -8,10 +8,9 @@ #include #include -#include - -#include "common/assert.h" -#include "common/common_types.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/interface/A64/a64.h" using Vector = Dynarmic::A64::Vector; diff --git a/tests/A64/verify_unicorn.cpp b/tests/A64/verify_unicorn.cpp index afcb820a..f580ae9a 100644 --- a/tests/A64/verify_unicorn.cpp +++ b/tests/A64/verify_unicorn.cpp @@ -7,9 +7,9 @@ #include -#include "rand_int.h" -#include "testenv.h" -#include "unicorn_emu/a64_unicorn.h" +#include "../rand_int.h" +#include "../unicorn_emu/a64_unicorn.h" +#include "./testenv.h" using namespace Dynarmic; diff --git a/tests/decoder_tests.cpp b/tests/decoder_tests.cpp index e3155483..f76826ca 100644 --- a/tests/decoder_tests.cpp +++ b/tests/decoder_tests.cpp @@ -9,11 +9,11 @@ #include -#include -#include "common/assert.h" -#include "frontend/A32/decoder/asimd.h" -#include "frontend/A32/translate/impl/translate.h" -#include "ir/opcodes.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/frontend/A32/decoder/asimd.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" +#include "dynarmic/interface/A32/config.h" +#include "dynarmic/ir/opcodes.h" using namespace Dynarmic; diff --git a/tests/fp/FPToFixed.cpp b/tests/fp/FPToFixed.cpp index 896b7310..0aa7a82f 100644 --- a/tests/fp/FPToFixed.cpp +++ b/tests/fp/FPToFixed.cpp @@ -8,12 +8,12 @@ #include -#include "common/common_types.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/op.h" -#include "common/fp/rounding_mode.h" -#include "rand_int.h" +#include "../rand_int.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/op.h" +#include "dynarmic/common/fp/rounding_mode.h" using namespace Dynarmic; using namespace Dynarmic::FP; diff --git a/tests/fp/FPValue.cpp b/tests/fp/FPValue.cpp index 37859505..b90f5f70 100644 --- a/tests/fp/FPValue.cpp +++ b/tests/fp/FPValue.cpp @@ -3,7 +3,7 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/fp/info.h" +#include "dynarmic/common/fp/info.h" using namespace Dynarmic::FP; diff --git a/tests/fp/mantissa_util_tests.cpp b/tests/fp/mantissa_util_tests.cpp index d075849d..ee925170 100644 --- a/tests/fp/mantissa_util_tests.cpp +++ b/tests/fp/mantissa_util_tests.cpp @@ -8,10 +8,10 @@ #include -#include "common/common_types.h" -#include "common/fp/mantissa_util.h" -#include "common/safe_ops.h" -#include "rand_int.h" +#include "../rand_int.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/mantissa_util.h" +#include "dynarmic/common/safe_ops.h" using namespace Dynarmic; using namespace Dynarmic::FP; diff --git a/tests/fp/unpacked_tests.cpp b/tests/fp/unpacked_tests.cpp index 795271a8..8212878c 100644 --- a/tests/fp/unpacked_tests.cpp +++ b/tests/fp/unpacked_tests.cpp @@ -8,11 +8,11 @@ #include -#include "common/common_types.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/unpacked.h" -#include "rand_int.h" +#include "../rand_int.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/unpacked.h" using namespace Dynarmic; using namespace Dynarmic::FP; diff --git a/tests/fuzz_util.cpp b/tests/fuzz_util.cpp index 3acbc0dd..5a2afaba 100644 --- a/tests/fuzz_util.cpp +++ b/tests/fuzz_util.cpp @@ -8,11 +8,11 @@ #include #include -#include "common/assert.h" -#include "common/fp/fpcr.h" -#include "common/fp/rounding_mode.h" -#include "fuzz_util.h" -#include "rand_int.h" +#include "./fuzz_util.h" +#include "./rand_int.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/rounding_mode.h" using namespace Dynarmic; diff --git a/tests/fuzz_util.h b/tests/fuzz_util.h index 04bf0f3a..04334272 100644 --- a/tests/fuzz_util.h +++ b/tests/fuzz_util.h @@ -8,7 +8,7 @@ #include #include -#include "common/common_types.h" +#include "dynarmic/common/common_types.h" using Vector = std::array; diff --git a/tests/print_info.cpp b/tests/print_info.cpp index 494b9e54..febc18f8 100644 --- a/tests/print_info.cpp +++ b/tests/print_info.cpp @@ -12,24 +12,23 @@ #include #include -#include -#include - -#include "common/bit_util.h" -#include "common/common_types.h" -#include "common/llvm_disassemble.h" -#include "frontend/A32/decoder/arm.h" -#include "frontend/A32/decoder/asimd.h" -#include "frontend/A32/decoder/vfp.h" -#include "frontend/A32/location_descriptor.h" -#include "frontend/A32/translate/impl/translate.h" -#include "frontend/A32/translate/translate.h" -#include "frontend/A64/decoder/a64.h" -#include "frontend/A64/location_descriptor.h" -#include "frontend/A64/translate/impl/impl.h" -#include "frontend/A64/translate/translate.h" -#include "ir/basic_block.h" -#include "ir/opt/passes.h" +#include "dynarmic/common/bit_util.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/llvm_disassemble.h" +#include "dynarmic/frontend/A32/decoder/arm.h" +#include "dynarmic/frontend/A32/decoder/asimd.h" +#include "dynarmic/frontend/A32/decoder/vfp.h" +#include "dynarmic/frontend/A32/location_descriptor.h" +#include "dynarmic/frontend/A32/translate/impl/translate.h" +#include "dynarmic/frontend/A32/translate/translate.h" +#include "dynarmic/frontend/A64/decoder/a64.h" +#include "dynarmic/frontend/A64/location_descriptor.h" +#include "dynarmic/frontend/A64/translate/impl/impl.h" +#include "dynarmic/frontend/A64/translate/translate.h" +#include "dynarmic/interface/A32/a32.h" +#include "dynarmic/interface/A32/disassembler.h" +#include "dynarmic/ir/basic_block.h" +#include "dynarmic/ir/opt/passes.h" #include #include diff --git a/tests/rsqrt_test.cpp b/tests/rsqrt_test.cpp index 735aefc9..5c57a6fb 100644 --- a/tests/rsqrt_test.cpp +++ b/tests/rsqrt_test.cpp @@ -6,10 +6,10 @@ #include #include -#include "common/common_types.h" -#include "common/fp/fpcr.h" -#include "common/fp/fpsr.h" -#include "common/fp/op/FPRSqrtEstimate.h" +#include "dynarmic/common/common_types.h" +#include "dynarmic/common/fp/fpcr.h" +#include "dynarmic/common/fp/fpsr.h" +#include "dynarmic/common/fp/op/FPRSqrtEstimate.h" extern "C" u32 rsqrt_inaccurate(u32); extern "C" u32 rsqrt_full(u32); diff --git a/tests/unicorn_emu/a32_unicorn.cpp b/tests/unicorn_emu/a32_unicorn.cpp index 16052e4c..d3061afe 100644 --- a/tests/unicorn_emu/a32_unicorn.cpp +++ b/tests/unicorn_emu/a32_unicorn.cpp @@ -4,10 +4,11 @@ */ #include -#include "A32/testenv.h" -#include "a32_unicorn.h" -#include "common/assert.h" -#include "common/bit_util.h" + +#include "../A32/testenv.h" +#include "./a32_unicorn.h" +#include "dynarmic/common/assert.h" +#include "dynarmic/common/bit_util.h" #define CHECKED(expr) \ do { \ diff --git a/tests/unicorn_emu/a32_unicorn.h b/tests/unicorn_emu/a32_unicorn.h index 1570ffe6..2b97ddd5 100644 --- a/tests/unicorn_emu/a32_unicorn.h +++ b/tests/unicorn_emu/a32_unicorn.h @@ -16,9 +16,8 @@ #include #endif -#include "common/common_types.h" - -#include "A32/testenv.h" +#include "../A32/testenv.h" +#include "dynarmic/common/common_types.h" namespace Unicorn::A32 { static constexpr size_t num_gprs = 16; diff --git a/tests/unicorn_emu/a64_unicorn.cpp b/tests/unicorn_emu/a64_unicorn.cpp index ae5dd136..e4b97615 100644 --- a/tests/unicorn_emu/a64_unicorn.cpp +++ b/tests/unicorn_emu/a64_unicorn.cpp @@ -3,8 +3,8 @@ * SPDX-License-Identifier: 0BSD */ -#include "common/assert.h" -#include "a64_unicorn.h" +#include "./a64_unicorn.h" +#include "dynarmic/common/assert.h" #define CHECKED(expr) \ do { \ diff --git a/tests/unicorn_emu/a64_unicorn.h b/tests/unicorn_emu/a64_unicorn.h index d0f27ada..362cc1d9 100644 --- a/tests/unicorn_emu/a64_unicorn.h +++ b/tests/unicorn_emu/a64_unicorn.h @@ -16,8 +16,8 @@ #include #endif -#include "common/common_types.h" -#include "A64/testenv.h" +#include "../A64/testenv.h" +#include "dynarmic/common/common_types.h" class A64Unicorn final { public: