Consolidate all source files into src/ directory

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()

README.md

@@ -84,8 +84,8 @@ The below is a minimal example. Bring-your-own memory system.
 #include <cstdio>
 #include <exception>
 
-#include <dynarmic/A32/a32.h>
-#include <dynarmic/A32/config.h>
+#include "dynarmic/interface/A32/a32.h"
+#include "dynarmic/interface/A32/config.h"
 
 using u8 = std::uint8_t;
 using u16 = std::uint16_t;

src/common/fp/op.h

@@ -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"

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

src/dynarmic/backend/x64/a32_emit_x64.cpp

@@ -11,28 +11,27 @@
 #include <fmt/ostream.h>
 #include <mp/traits/integer_of_size.h>
 
-#include <dynarmic/A32/coprocessor.h>
-#include <dynarmic/exclusive_monitor.h>
-
-#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

src/dynarmic/backend/x64/a32_emit_x64.h

@@ -12,14 +12,13 @@
 
 #include <tsl/robin_map.h>
 
-#include <dynarmic/A32/a32.h>
-#include <dynarmic/A32/config.h>
-
-#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

src/dynarmic/backend/x64/a32_interface.cpp

@@ -9,24 +9,23 @@
 #include <boost/icl/interval_set.hpp>
 #include <fmt/format.h>
 
-#include <dynarmic/A32/a32.h>
-#include <dynarmic/A32/context.h>
-
-#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 {
 

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 {
 

src/dynarmic/backend/x64/a32_jitstate.h

@@ -9,7 +9,7 @@
 
 #include <xbyak.h>
 
-#include "common/common_types.h"
+#include "dynarmic/common/common_types.h"
 
 namespace Dynarmic::Backend::X64 {
 

src/dynarmic/backend/x64/a64_emit_x64.cpp

@@ -9,27 +9,26 @@
 #include <fmt/ostream.h>
 #include <mp/traits/integer_of_size.h>
 
-#include <dynarmic/exclusive_monitor.h>
-
-#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

src/dynarmic/backend/x64/a64_emit_x64.h

@@ -9,14 +9,13 @@
 #include <map>
 #include <tuple>
 
-#include <dynarmic/A64/a64.h>
-#include <dynarmic/A64/config.h>
-
-#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

src/dynarmic/backend/x64/a64_interface.cpp

@@ -7,19 +7,19 @@
 #include <memory>
 
 #include <boost/icl/interval_set.hpp>
-#include <dynarmic/A64/a64.h>
 
-#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 {
 

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 {
 

src/dynarmic/backend/x64/a64_jitstate.h

@@ -9,9 +9,9 @@
 
 #include <xbyak.h>
 
-#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 {
 

src/dynarmic/backend/x64/abi.cpp

@@ -8,10 +8,10 @@
 
 #include <xbyak.h>
 
-#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 {
 

src/dynarmic/backend/x64/abi.h

@@ -6,8 +6,8 @@
 
 #include <array>
 
-#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 {
 

src/dynarmic/backend/x64/block_of_code.cpp

@@ -8,14 +8,14 @@
 
 #include <xbyak.h>
 
-#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 <windows.h>

src/dynarmic/backend/x64/block_of_code.h

@@ -13,13 +13,13 @@
 #include <xbyak.h>
 #include <xbyak_util.h>
 
-#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 {
 

src/dynarmic/backend/x64/block_range_information.cpp

@@ -7,8 +7,8 @@
 #include <boost/icl/interval_set.hpp>
 #include <tsl/robin_set.h>
 
-#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 {
 

src/dynarmic/backend/x64/block_range_information.h

@@ -11,7 +11,7 @@
 #include <boost/icl/interval_set.hpp>
 #include <tsl/robin_set.h>
 
-#include "ir/location_descriptor.h"
+#include "dynarmic/ir/location_descriptor.h"
 
 namespace Dynarmic::Backend::X64 {
 

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 {
 

src/dynarmic/backend/x64/callback.h

@@ -10,7 +10,7 @@
 
 #include <xbyak.h>
 
-#include "common/common_types.h"
+#include "dynarmic/common/common_types.h"
 
 namespace Dynarmic::Backend::X64 {
 

src/dynarmic/backend/x64/constant_pool.cpp

@@ -5,9 +5,9 @@
 
 #include <cstring>
 
-#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 {
 

src/dynarmic/backend/x64/constant_pool.h

@@ -10,7 +10,7 @@
 
 #include <xbyak.h>
 
-#include "common/common_types.h"
+#include "dynarmic/common/common_types.h"
 
 namespace Dynarmic::Backend::X64 {
 

src/dynarmic/backend/x64/devirtualize.h

@@ -10,9 +10,9 @@
 
 #include <mp/traits/function_info.h>
 
-#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 {

src/dynarmic/backend/x64/emit_x64.cpp

@@ -7,19 +7,19 @@
 
 #include <tsl/robin_set.h>
 
-#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.

src/dynarmic/backend/x64/emit_x64.h

@@ -16,12 +16,12 @@
 
 #include <xbyak_util.h>
 
-#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

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 {
 

src/dynarmic/backend/x64/emit_x64_crc32.cpp

@@ -6,10 +6,10 @@
 #include <array>
 #include <climits>
 
-#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 {
 

src/dynarmic/backend/x64/emit_x64_data_processing.cpp

@@ -6,13 +6,13 @@
 #include <cstddef>
 #include <type_traits>
 
-#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 {
 

src/dynarmic/backend/x64/emit_x64_floating_point.cpp

@@ -14,22 +14,21 @@
 #include <mp/typelist/list.h>
 #include <mp/typelist/lower_to_tuple.h>
 
-#include <dynarmic/optimization_flags.h>
-
-#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 {
 

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 {
 

src/dynarmic/backend/x64/emit_x64_saturation.cpp

@@ -7,14 +7,14 @@
 
 #include <mp/traits/integer_of_size.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 "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 {
 

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 {
 

src/dynarmic/backend/x64/emit_x64_vector.cpp

@@ -10,16 +10,16 @@
 
 #include <mp/traits/function_info.h>
 
-#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();
 

src/dynarmic/backend/x64/emit_x64_vector_floating_point.cpp

@@ -17,19 +17,18 @@
 #include <mp/typelist/list.h>
 #include <mp/typelist/lower_to_tuple.h>
 
-#include <dynarmic/optimization_flags.h>
-
-#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 {
 

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 {
 

src/dynarmic/backend/x64/exception_handler.h

@@ -8,7 +8,7 @@
 #include <functional>
 #include <memory>
 
-#include "common/common_types.h"
+#include "dynarmic/common/common_types.h"
 
 namespace Dynarmic::Backend::X64 {
 

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 {
 

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 <mach/mach.h>
 #include <mach/message.h>
@@ -17,13 +17,13 @@
 
 #include <fmt/format.h>
 
-#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 {
 

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 <cstring>
 #include <functional>
@@ -18,10 +18,10 @@
 #include <ucontext.h>
 #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 {
 

src/dynarmic/backend/x64/exception_handler_windows.cpp

@@ -9,12 +9,12 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#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;
 

src/dynarmic/backend/x64/exclusive_monitor.cpp

@@ -5,8 +5,8 @@
 
 #include <algorithm>
 
-#include <dynarmic/exclusive_monitor.h>
-#include "common/assert.h"
+#include "dynarmic/common/assert.h"
+#include "dynarmic/interface/exclusive_monitor.h"
 
 namespace Dynarmic {
 

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 {
 

src/dynarmic/backend/x64/hostloc.cpp

@@ -5,9 +5,9 @@
 
 #include <xbyak.h>
 
-#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 {
 

src/dynarmic/backend/x64/hostloc.h

@@ -6,8 +6,8 @@
 
 #include <xbyak.h>
 
-#include "common/assert.h"
-#include "common/common_types.h"
+#include "dynarmic/common/assert.h"
+#include "dynarmic/common/common_types.h"
 
 namespace Dynarmic::Backend::X64 {
 

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 {
 

src/dynarmic/backend/x64/oparg.h

@@ -7,7 +7,7 @@
 
 #include <xbyak.h>
 
-#include "common/assert.h"
+#include "dynarmic/common/assert.h"
 
 namespace Dynarmic::Backend::X64 {
 

src/dynarmic/backend/x64/perf_map.cpp

@@ -6,7 +6,7 @@
 #include <cstddef>
 #include <string>
 
-#include "backend/x64/perf_map.h"
+#include "dynarmic/backend/x64/perf_map.h"
 
 #ifdef __linux__
 
@@ -18,7 +18,7 @@
 
 #include <fmt/format.h>
 
-#include "common/common_types.h"
+#include "dynarmic/common/common_types.h"
 
 namespace Dynarmic::Backend::X64 {
 

src/dynarmic/backend/x64/perf_map.h

@@ -7,7 +7,7 @@
 
 #include <string_view>
 
-#include "common/cast_util.h"
+#include "dynarmic/common/cast_util.h"
 
 namespace Dynarmic::Backend::X64 {
 

src/dynarmic/backend/x64/reg_alloc.cpp

@@ -10,10 +10,10 @@
 #include <fmt/ostream.h>
 #include <xbyak.h>
 
-#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 {
 

src/dynarmic/backend/x64/reg_alloc.h

@@ -13,13 +13,13 @@
 
 #include <xbyak.h>
 
-#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 {
 

src/dynarmic/backend/x64/stack_layout.h

@@ -7,7 +7,7 @@
 
 #include <array>
 
-#include "common/common_types.h"
+#include "dynarmic/common/common_types.h"
 
 namespace Dynarmic::Backend::X64 {
 

src/dynarmic/common/assert.cpp

@@ -8,7 +8,7 @@
 
 #include <fmt/format.h>
 
-#include "common/assert.h"
+#include "dynarmic/common/assert.h"
 
 namespace Dynarmic::Common {
 

src/dynarmic/common/assert.h

@@ -7,7 +7,7 @@
 
 #include <fmt/format.h>
 
-#include "common/unlikely.h"
+#include "dynarmic/common/unlikely.h"
 
 namespace Dynarmic::Common {
 

src/dynarmic/common/bit_util.h

@@ -10,8 +10,8 @@
 #include <cstddef>
 #include <type_traits>
 
-#include "common/assert.h"
-#include "common/common_types.h"
+#include "dynarmic/common/assert.h"
+#include "dynarmic/common/common_types.h"
 
 namespace Dynarmic::Common {
 

src/dynarmic/common/crypto/aes.cpp

@@ -5,8 +5,8 @@
 
 #include <array>
 
-#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 {
 

src/dynarmic/common/crypto/aes.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <array>
-#include "common/common_types.h"
+#include "dynarmic/common/common_types.h"
 
 namespace Dynarmic::Common::Crypto::AES {
 

src/dynarmic/common/crypto/crc32.cpp

@@ -5,8 +5,8 @@
 
 #include <array>
 
-#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 {
 

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 {
 

src/dynarmic/common/crypto/sm4.cpp

@@ -5,8 +5,8 @@
 
 #include <array>
 
-#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 {
 

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 {
 

src/dynarmic/common/fp/fpcr.h

@@ -7,10 +7,10 @@
 
 #include <optional>
 
-#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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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"

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 {
 

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 {

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 {
 

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 {
 

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 {
 

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 {
 

src/dynarmic/common/fp/op/FPRecipEstimate.cpp

@@ -5,16 +5,16 @@
 
 #include <tuple>
 
-#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 {
 

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 {

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

src/dynarmic/common/fp/process_nan.cpp

@@ -5,14 +5,14 @@
 
 #include <optional>
 
-#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 {
 

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 {
 

src/dynarmic/common/fp/unpacked.h

@@ -7,8 +7,8 @@
 
 #include <tuple>
 
-#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 {