diff --git a/Source/Tools/CMakeLists.txt b/Source/Tools/CMakeLists.txt index 357d16cd0..e45d1f992 100644 --- a/Source/Tools/CMakeLists.txt +++ b/Source/Tools/CMakeLists.txt @@ -18,6 +18,11 @@ if (NOT MINGW_BUILD) add_subdirectory(FEXServer/) add_subdirectory(FEXBash/) add_subdirectory(CodeSizeValidation/) + add_subdirectory(LinuxEmulation/) + + if (BUILD_TESTS) + add_subdirectory(IRLoader/) + endif() endif() add_subdirectory(FEXLoader/) diff --git a/Source/Tools/FEXLoader/HarnessHelpers.h b/Source/Tools/CommonTools/HarnessHelpers.h similarity index 100% rename from Source/Tools/FEXLoader/HarnessHelpers.h rename to Source/Tools/CommonTools/HarnessHelpers.h diff --git a/Source/Tools/FEXLoader/CMakeLists.txt b/Source/Tools/FEXLoader/CMakeLists.txt index 29864bfc0..11d8e5940 100644 --- a/Source/Tools/FEXLoader/CMakeLists.txt +++ b/Source/Tools/FEXLoader/CMakeLists.txt @@ -6,8 +6,6 @@ if (ENABLE_VIXL_SIMULATOR) endif() if (NOT MINGW_BUILD) - add_subdirectory(LinuxSyscalls) - if (TERMUX_BUILD) # Termux needs android-shmem to get the shm emulation library. list(APPEND LIBS android-shmem) @@ -16,7 +14,6 @@ if (NOT MINGW_BUILD) function(GenerateInterpreter NAME AsInterpreter) add_executable(${NAME} FEXLoader.cpp - VDSO_Emulation.cpp AOT/AOTGenerator.cpp) target_compile_definitions(${NAME} PRIVATE ${DEFINES}) @@ -181,24 +178,4 @@ if (BUILD_TESTS) ${LIBS} ${PTHREAD_LIB} ) - - if (NOT MINGW_BUILD) - add_executable(IRLoader - IRLoader.cpp - ) - target_compile_definitions(IRLoader PRIVATE ${DEFINES}) - - target_include_directories(IRLoader - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/Source/ - ${CMAKE_BINARY_DIR}/generated - ) - target_link_libraries(IRLoader - PRIVATE - ${LIBS} - LinuxEmulation - ${PTHREAD_LIB} - fmt::fmt - ) - endif() endif() diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/CMakeLists.txt b/Source/Tools/FEXLoader/LinuxSyscalls/CMakeLists.txt deleted file mode 100644 index 660a82d92..000000000 --- a/Source/Tools/FEXLoader/LinuxSyscalls/CMakeLists.txt +++ /dev/null @@ -1,168 +0,0 @@ -add_compile_options(-fno-operator-names) - -set (SRCS - GdbServer.cpp - EmulatedFiles/EmulatedFiles.cpp - FileManagement.cpp - LinuxAllocator.cpp - SignalDelegator.cpp - Syscalls.cpp - SyscallsSMCTracking.cpp - SyscallsVMATracking.cpp - Utils/Threads.cpp - x32/Syscalls.cpp - x32/EPoll.cpp - x32/FD.cpp - x32/FS.cpp - x32/Info.cpp - x32/IO.cpp - x32/Memory.cpp - x32/Msg.cpp - x32/NotImplemented.cpp - x32/Semaphore.cpp - x32/Sched.cpp - x32/Signals.cpp - x32/Socket.cpp - x32/Stubs.cpp - x32/Thread.cpp - x32/Time.cpp - x32/Timer.cpp - x32/IoctlEmulation.cpp - x64/EPoll.cpp - x64/FD.cpp - x64/IO.cpp - x64/Ioctl.cpp - x64/Info.cpp - x64/Memory.cpp - x64/Msg.cpp - x64/NotImplemented.cpp - x64/Semaphore.cpp - x64/Sched.cpp - x64/Signals.cpp - x64/Socket.cpp - x64/Thread.cpp - x64/Syscalls.cpp - x64/Time.cpp - Syscalls/EPoll.cpp - Syscalls/FD.cpp - Syscalls/FS.cpp - Syscalls/Info.cpp - Syscalls/IO.cpp - Syscalls/IOUring.cpp - Syscalls/Key.cpp - Syscalls/Memory.cpp - Syscalls/Msg.cpp - Syscalls/Namespace.cpp - Syscalls/Sched.cpp - Syscalls/Semaphore.cpp - Syscalls/SHM.cpp - Syscalls/Signals.cpp - Syscalls/Socket.cpp - Syscalls/Thread.cpp - Syscalls/Time.cpp - Syscalls/Timer.cpp - Syscalls/NotImplemented.cpp - Syscalls/Stubs.cpp) - -add_library(LinuxEmulation STATIC ${SRCS}) - -target_compile_options(LinuxEmulation -PRIVATE - -Wall - -Werror=cast-qual - -Werror=ignored-qualifiers - -Werror=implicit-fallthrough - - -Wno-trigraphs - -fwrapv -) - -target_include_directories(LinuxEmulation -PRIVATE - ${CMAKE_BINARY_DIR}/generated - ${CMAKE_CURRENT_SOURCE_DIR}/../ - ${PROJECT_SOURCE_DIR}/External/drm-headers/include/ -) - -target_link_libraries(LinuxEmulation -PRIVATE - Common - FEXCore - CommonTools -) - -set(HEADERS_TO_VERIFY - x32/Types.h x86_32 # This needs to match structs to 32bit structs - x32/Ioctl/asound.h x86_32 # This needs to match structs to 32bit structs - x32/Ioctl/drm.h x86_32 # This needs to match structs to 32bit structs - x32/Ioctl/streams.h x86_32 # This needs to match structs to 32bit structs - x32/Ioctl/usbdev.h x86_32 # This needs to match structs to 32bit structs - x32/Ioctl/input.h x86_32 # This needs to match structs to 32bit structs - x32/Ioctl/sockios.h x86_32 # This needs to match structs to 32bit structs - x32/Ioctl/joystick.h x86_32 # This needs to match structs to 32bit structs - x64/Types.h x86_64 # This needs to match structs to 64bit structs -) - -list(LENGTH HEADERS_TO_VERIFY ARG_COUNT) -math(EXPR ARG_COUNT "${ARG_COUNT}-1") - -set (ARGS - "-x" "c++" - "-std=c++20" - "-fno-operator-names" - "-I${PROJECT_SOURCE_DIR}/External/drm-headers/include/" - "-I${CMAKE_CURRENT_SOURCE_DIR}/../") -# Global include directories -get_directory_property (INC_DIRS INCLUDE_DIRECTORIES) -list(TRANSFORM INC_DIRS PREPEND "-I") -list(APPEND ARGS ${INC_DIRS}) - -# FEXCore directories -get_target_property(INC_DIRS FEXCore INTERFACE_INCLUDE_DIRECTORIES) -list(TRANSFORM INC_DIRS PREPEND "-I") -list(APPEND ARGS ${INC_DIRS}) - -foreach(Index RANGE 0 ${ARG_COUNT} 2) - math(EXPR TEST_TYPE_INDEX "${Index}+1") - - list(GET HEADERS_TO_VERIFY ${Index} HEADER) - list(GET HEADERS_TO_VERIFY ${TEST_TYPE_INDEX} TEST_TYPE) - - file(RELATIVE_PATH REL_HEADER ${CMAKE_BINARY_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}") - set(TEST_NAME "${TEST_DESC}/Test_verify_${HEADER}") - set(TEST_NAME_ARCH "${TEST_DESC}/Test_verify_arch_${HEADER}") - - add_test( - NAME ${TEST_NAME}_x86_64 - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - COMMAND "python3" "${CMAKE_SOURCE_DIR}/Scripts/StructPackVerifier.py" "-c1" "x86_64" "${REL_HEADER}" ${ARGS}) - - add_test( - NAME ${TEST_NAME}_aarch64 - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - COMMAND "python3" "${CMAKE_SOURCE_DIR}/Scripts/StructPackVerifier.py" "-c1" "aarch64" "${REL_HEADER}" ${ARGS}) - - add_test( - NAME ${TEST_NAME_ARCH}_x86_64 - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - COMMAND "python3" "${CMAKE_SOURCE_DIR}/Scripts/StructPackVerifier.py" "-c1" "x86_64" "-c2" "${TEST_TYPE}" "${REL_HEADER}" ${ARGS}) - - add_test( - NAME ${TEST_NAME_ARCH}_aarch64 - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - COMMAND "python3" "${CMAKE_SOURCE_DIR}/Scripts/StructPackVerifier.py" "-c1" "aarch64" "-c2" "${TEST_TYPE}" "${REL_HEADER}" ${ARGS}) - - set_property(TEST ${TEST_NAME}_x86_64 APPEND PROPERTY DEPENDS "${HEADER}") - set_property(TEST ${TEST_NAME}_aarch64 APPEND PROPERTY DEPENDS "${HEADER}") - set_property(TEST ${TEST_NAME_ARCH}_x86_64 APPEND PROPERTY DEPENDS "${HEADER}") - set_property(TEST ${TEST_NAME_ARCH}_aarch64 APPEND PROPERTY DEPENDS "${HEADER}") -endforeach() - -execute_process(COMMAND "nproc" OUTPUT_VARIABLE CORES) -string(STRIP ${CORES} CORES) - -add_custom_target( - struct_verifier - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - USES_TERMINAL - COMMAND "ctest" "--output-on-failure" "--timeout" "302" "-j${CORES}" "-R" "Test_verify*") diff --git a/Source/Tools/IRLoader/CMakeLists.txt b/Source/Tools/IRLoader/CMakeLists.txt new file mode 100644 index 000000000..5556b1c23 --- /dev/null +++ b/Source/Tools/IRLoader/CMakeLists.txt @@ -0,0 +1,23 @@ +list(APPEND LIBS FEXCore Common) + +add_executable(IRLoader + IRLoader.cpp +) + +if (ENABLE_VIXL_SIMULATOR) + target_compile_definitions(IRLoader PRIVATE "-DVIXL_SIMULATOR=1") +endif() + +target_include_directories(IRLoader + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/Source/ + ${CMAKE_BINARY_DIR}/generated +) +target_link_libraries(IRLoader + PRIVATE + ${LIBS} + LinuxEmulation + CommonTools + ${PTHREAD_LIB} + fmt::fmt +) diff --git a/Source/Tools/FEXLoader/IRLoader.cpp b/Source/Tools/IRLoader/IRLoader.cpp similarity index 100% rename from Source/Tools/FEXLoader/IRLoader.cpp rename to Source/Tools/IRLoader/IRLoader.cpp diff --git a/Source/Tools/FEXLoader/ArchHelpers/MContext.h b/Source/Tools/LinuxEmulation/ArchHelpers/MContext.h similarity index 100% rename from Source/Tools/FEXLoader/ArchHelpers/MContext.h rename to Source/Tools/LinuxEmulation/ArchHelpers/MContext.h diff --git a/Source/Tools/FEXLoader/ArchHelpers/UContext.h b/Source/Tools/LinuxEmulation/ArchHelpers/UContext.h similarity index 100% rename from Source/Tools/FEXLoader/ArchHelpers/UContext.h rename to Source/Tools/LinuxEmulation/ArchHelpers/UContext.h diff --git a/Source/Tools/FEXLoader/ArchHelpers/WinContext.h b/Source/Tools/LinuxEmulation/ArchHelpers/WinContext.h similarity index 100% rename from Source/Tools/FEXLoader/ArchHelpers/WinContext.h rename to Source/Tools/LinuxEmulation/ArchHelpers/WinContext.h diff --git a/Source/Tools/LinuxEmulation/CMakeLists.txt b/Source/Tools/LinuxEmulation/CMakeLists.txt new file mode 100644 index 000000000..c56d02209 --- /dev/null +++ b/Source/Tools/LinuxEmulation/CMakeLists.txt @@ -0,0 +1,182 @@ +add_compile_options(-fno-operator-names) + +set (SRCS + VDSO_Emulation.cpp + LinuxSyscalls/GdbServer.cpp + LinuxSyscalls/EmulatedFiles/EmulatedFiles.cpp + LinuxSyscalls/FileManagement.cpp + LinuxSyscalls/LinuxAllocator.cpp + LinuxSyscalls/SignalDelegator.cpp + LinuxSyscalls/Syscalls.cpp + LinuxSyscalls/SyscallsSMCTracking.cpp + LinuxSyscalls/SyscallsVMATracking.cpp + LinuxSyscalls/Utils/Threads.cpp + LinuxSyscalls/x32/Syscalls.cpp + LinuxSyscalls/x32/EPoll.cpp + LinuxSyscalls/x32/FD.cpp + LinuxSyscalls/x32/FS.cpp + LinuxSyscalls/x32/Info.cpp + LinuxSyscalls/x32/IO.cpp + LinuxSyscalls/x32/Memory.cpp + LinuxSyscalls/x32/Msg.cpp + LinuxSyscalls/x32/NotImplemented.cpp + LinuxSyscalls/x32/Semaphore.cpp + LinuxSyscalls/x32/Sched.cpp + LinuxSyscalls/x32/Signals.cpp + LinuxSyscalls/x32/Socket.cpp + LinuxSyscalls/x32/Stubs.cpp + LinuxSyscalls/x32/Thread.cpp + LinuxSyscalls/x32/Time.cpp + LinuxSyscalls/x32/Timer.cpp + LinuxSyscalls/x32/IoctlEmulation.cpp + LinuxSyscalls/x64/EPoll.cpp + LinuxSyscalls/x64/FD.cpp + LinuxSyscalls/x64/IO.cpp + LinuxSyscalls/x64/Ioctl.cpp + LinuxSyscalls/x64/Info.cpp + LinuxSyscalls/x64/Memory.cpp + LinuxSyscalls/x64/Msg.cpp + LinuxSyscalls/x64/NotImplemented.cpp + LinuxSyscalls/x64/Semaphore.cpp + LinuxSyscalls/x64/Sched.cpp + LinuxSyscalls/x64/Signals.cpp + LinuxSyscalls/x64/Socket.cpp + LinuxSyscalls/x64/Thread.cpp + LinuxSyscalls/x64/Syscalls.cpp + LinuxSyscalls/x64/Time.cpp + LinuxSyscalls/Syscalls/EPoll.cpp + LinuxSyscalls/Syscalls/FD.cpp + LinuxSyscalls/Syscalls/FS.cpp + LinuxSyscalls/Syscalls/Info.cpp + LinuxSyscalls/Syscalls/IO.cpp + LinuxSyscalls/Syscalls/IOUring.cpp + LinuxSyscalls/Syscalls/Key.cpp + LinuxSyscalls/Syscalls/Memory.cpp + LinuxSyscalls/Syscalls/Msg.cpp + LinuxSyscalls/Syscalls/Namespace.cpp + LinuxSyscalls/Syscalls/Sched.cpp + LinuxSyscalls/Syscalls/Semaphore.cpp + LinuxSyscalls/Syscalls/SHM.cpp + LinuxSyscalls/Syscalls/Signals.cpp + LinuxSyscalls/Syscalls/Socket.cpp + LinuxSyscalls/Syscalls/Thread.cpp + LinuxSyscalls/Syscalls/Time.cpp + LinuxSyscalls/Syscalls/Timer.cpp + LinuxSyscalls/Syscalls/NotImplemented.cpp + LinuxSyscalls/Syscalls/Stubs.cpp) + +add_library(LinuxEmulation STATIC ${SRCS}) + +target_compile_options(LinuxEmulation +PRIVATE + -Wall + -Werror=cast-qual + -Werror=ignored-qualifiers + -Werror=implicit-fallthrough + + -Wno-trigraphs + -fwrapv +) + +target_include_directories(LinuxEmulation +PRIVATE + ${CMAKE_BINARY_DIR}/generated + ${CMAKE_CURRENT_SOURCE_DIR}/ + ${PROJECT_SOURCE_DIR}/External/drm-headers/include/ +) + +target_include_directories(LinuxEmulation + INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR}/ +) + +target_link_libraries(LinuxEmulation + PRIVATE + Common + CommonTools +) + +target_link_libraries(LinuxEmulation + INTERFACE + FEXCore +) + +set(HEADERS_TO_VERIFY + LinuxSyscalls/x32/Types.h x86_32 # This needs to match structs to 32bit structs + LinuxSyscalls/x32/Ioctl/asound.h x86_32 # This needs to match structs to 32bit structs + LinuxSyscalls/x32/Ioctl/drm.h x86_32 # This needs to match structs to 32bit structs + LinuxSyscalls/x32/Ioctl/streams.h x86_32 # This needs to match structs to 32bit structs + LinuxSyscalls/x32/Ioctl/usbdev.h x86_32 # This needs to match structs to 32bit structs + LinuxSyscalls/x32/Ioctl/input.h x86_32 # This needs to match structs to 32bit structs + LinuxSyscalls/x32/Ioctl/sockios.h x86_32 # This needs to match structs to 32bit structs + LinuxSyscalls/x32/Ioctl/joystick.h x86_32 # This needs to match structs to 32bit structs + LinuxSyscalls/x64/Types.h x86_64 # This needs to match structs to 64bit structs +) + +list(LENGTH HEADERS_TO_VERIFY ARG_COUNT) +math(EXPR ARG_COUNT "${ARG_COUNT}-1") + +set (ARGS + "-x" "c++" + "-std=c++20" + "-fno-operator-names" + "-I${PROJECT_SOURCE_DIR}/External/drm-headers/include/" + "-I${CMAKE_CURRENT_SOURCE_DIR}/../") +# Global include directories +get_directory_property (INC_DIRS INCLUDE_DIRECTORIES) +list(TRANSFORM INC_DIRS PREPEND "-I") +list(APPEND ARGS ${INC_DIRS}) + +# FEXCore directories +get_target_property(INC_DIRS FEXCore INTERFACE_INCLUDE_DIRECTORIES) +list(TRANSFORM INC_DIRS PREPEND "-I") +list(APPEND ARGS ${INC_DIRS}) + +get_target_property(INC_DIRS LinuxEmulation INTERFACE_INCLUDE_DIRECTORIES) +list(TRANSFORM INC_DIRS PREPEND "-I") +list(APPEND ARGS ${INC_DIRS}) + +foreach(Index RANGE 0 ${ARG_COUNT} 2) + math(EXPR TEST_TYPE_INDEX "${Index}+1") + + list(GET HEADERS_TO_VERIFY ${Index} HEADER) + list(GET HEADERS_TO_VERIFY ${TEST_TYPE_INDEX} TEST_TYPE) + + file(RELATIVE_PATH REL_HEADER ${CMAKE_BINARY_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}") + set(TEST_NAME "${TEST_DESC}/Test_verify_${HEADER}") + set(TEST_NAME_ARCH "${TEST_DESC}/Test_verify_arch_${HEADER}") + + add_test( + NAME ${TEST_NAME}_x86_64 + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + COMMAND "python3" "${CMAKE_SOURCE_DIR}/Scripts/StructPackVerifier.py" "-c1" "x86_64" "${REL_HEADER}" ${ARGS}) + + add_test( + NAME ${TEST_NAME}_aarch64 + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + COMMAND "python3" "${CMAKE_SOURCE_DIR}/Scripts/StructPackVerifier.py" "-c1" "aarch64" "${REL_HEADER}" ${ARGS}) + + add_test( + NAME ${TEST_NAME_ARCH}_x86_64 + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + COMMAND "python3" "${CMAKE_SOURCE_DIR}/Scripts/StructPackVerifier.py" "-c1" "x86_64" "-c2" "${TEST_TYPE}" "${REL_HEADER}" ${ARGS}) + + add_test( + NAME ${TEST_NAME_ARCH}_aarch64 + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + COMMAND "python3" "${CMAKE_SOURCE_DIR}/Scripts/StructPackVerifier.py" "-c1" "aarch64" "-c2" "${TEST_TYPE}" "${REL_HEADER}" ${ARGS}) + + set_property(TEST ${TEST_NAME}_x86_64 APPEND PROPERTY DEPENDS "${HEADER}") + set_property(TEST ${TEST_NAME}_aarch64 APPEND PROPERTY DEPENDS "${HEADER}") + set_property(TEST ${TEST_NAME_ARCH}_x86_64 APPEND PROPERTY DEPENDS "${HEADER}") + set_property(TEST ${TEST_NAME_ARCH}_aarch64 APPEND PROPERTY DEPENDS "${HEADER}") +endforeach() + +execute_process(COMMAND "nproc" OUTPUT_VARIABLE CORES) +string(STRIP ${CORES} CORES) + +add_custom_target( + struct_verifier + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + USES_TERMINAL + COMMAND "ctest" "--output-on-failure" "--timeout" "302" "-j${CORES}" "-R" "Test_verify*") diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Arm64/SyscallsEnum.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/Arm64/SyscallsEnum.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Arm64/SyscallsEnum.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Arm64/SyscallsEnum.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/EmulatedFiles/EmulatedFiles.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/EmulatedFiles/EmulatedFiles.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/EmulatedFiles/EmulatedFiles.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/EmulatedFiles/EmulatedFiles.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/EmulatedFiles/EmulatedFiles.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/EmulatedFiles/EmulatedFiles.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/EmulatedFiles/EmulatedFiles.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/EmulatedFiles/EmulatedFiles.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/FileManagement.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/FileManagement.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/FileManagement.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/FileManagement.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/GdbServer.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/GdbServer.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/GdbServer.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/GdbServer.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/GdbServer.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/GdbServer.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/GdbServer.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/GdbServer.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/LinuxAllocator.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/LinuxAllocator.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/LinuxAllocator.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/LinuxAllocator.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/LinuxAllocator.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/LinuxAllocator.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/LinuxAllocator.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/LinuxAllocator.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/SignalDelegator.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/SignalDelegator.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/SignalDelegator.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/SignalDelegator.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/SignalDelegator.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/SignalDelegator.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/SignalDelegator.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/SignalDelegator.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/EPoll.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/EPoll.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/EPoll.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/EPoll.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/FD.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/FD.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/FD.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/FD.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/FS.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/FS.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/FS.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/FS.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/IO.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/IO.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/IO.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/IO.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/IOUring.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/IOUring.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/IOUring.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/IOUring.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Info.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Info.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Info.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Info.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Key.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Key.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Key.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Key.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Memory.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Memory.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Memory.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Memory.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Msg.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Msg.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Msg.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Msg.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Namespace.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Namespace.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Namespace.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Namespace.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/NotImplemented.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/NotImplemented.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/NotImplemented.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/NotImplemented.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/SHM.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/SHM.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/SHM.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/SHM.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Sched.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Sched.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Sched.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Sched.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Semaphore.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Semaphore.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Semaphore.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Semaphore.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Signals.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Signals.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Signals.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Signals.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Socket.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Socket.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Socket.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Socket.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Stubs.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Stubs.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Stubs.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Stubs.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Thread.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Thread.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Thread.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Thread.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Thread.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Thread.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Thread.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Thread.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Time.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Time.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Time.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Time.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Timer.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Timer.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Timer.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Timer.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/SyscallsSMCTracking.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/SyscallsSMCTracking.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/SyscallsSMCTracking.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/SyscallsSMCTracking.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/SyscallsVMATracking.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/SyscallsVMATracking.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/SyscallsVMATracking.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/SyscallsVMATracking.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Types.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/Types.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Types.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Types.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Utils/Threads.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Utils/Threads.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Utils/Threads.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Utils/Threads.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Utils/Threads.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/Utils/Threads.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/Utils/Threads.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/Utils/Threads.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/EPoll.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/EPoll.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/EPoll.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/EPoll.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/FD.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/FD.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/FD.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/FD.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/FS.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/FS.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/FS.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/FS.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/IO.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/IO.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/IO.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/IO.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Info.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Info.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Info.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Info.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/HelperDefines.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/HelperDefines.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/HelperDefines.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/HelperDefines.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/amdgpu_drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/amdgpu_drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/amdgpu_drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/amdgpu_drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/asound.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/asound.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/asound.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/asound.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/asound.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/asound.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/asound.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/asound.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/drm.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/drm.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/drm.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/drm.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/ext_fs.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/ext_fs.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/ext_fs.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/ext_fs.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/ext_fs.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/ext_fs.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/ext_fs.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/ext_fs.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/f2fs.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/f2fs.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/f2fs.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/f2fs.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/f2fs.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/f2fs.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/f2fs.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/f2fs.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/i915_drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/i915_drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/i915_drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/i915_drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/input.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/input.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/input.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/input.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/input.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/input.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/input.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/input.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/joystick.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/joystick.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/joystick.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/joystick.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/joystick.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/joystick.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/joystick.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/joystick.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/lima_drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/lima_drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/lima_drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/lima_drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/msdos_fs.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/msdos_fs.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/msdos_fs.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/msdos_fs.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/msdos_fs.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/msdos_fs.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/msdos_fs.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/msdos_fs.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/msm_drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/msm_drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/msm_drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/msm_drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/nouveau_drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/nouveau_drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/nouveau_drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/nouveau_drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/panfrost_drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/panfrost_drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/panfrost_drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/panfrost_drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/radeon_drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/radeon_drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/radeon_drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/radeon_drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/sockios.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/sockios.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/sockios.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/sockios.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/sockios.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/sockios.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/sockios.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/sockios.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/streams.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/streams.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/streams.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/streams.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/streams.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/streams.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/streams.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/streams.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/usbdev.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/usbdev.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/usbdev.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/usbdev.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/usbdev.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/usbdev.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/usbdev.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/usbdev.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/v3d_drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/v3d_drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/v3d_drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/v3d_drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/vc4_drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/vc4_drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/vc4_drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/vc4_drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/virtio_drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/virtio_drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/virtio_drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/virtio_drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/wireless.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/wireless.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/wireless.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/wireless.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/wireless.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/wireless.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctl/wireless.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctl/wireless.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/IoctlEmulation.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/IoctlEmulation.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/IoctlEmulation.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/IoctlEmulation.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/IoctlEmulation.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/IoctlEmulation.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/IoctlEmulation.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/IoctlEmulation.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctls.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctls.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Ioctls.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Ioctls.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Memory.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Memory.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Memory.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Memory.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Msg.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Msg.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Msg.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Msg.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/NotImplemented.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/NotImplemented.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/NotImplemented.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/NotImplemented.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Sched.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Sched.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Sched.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Sched.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Semaphore.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Semaphore.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Semaphore.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Semaphore.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Signals.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Signals.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Signals.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Signals.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Socket.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Socket.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Socket.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Socket.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Stubs.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Stubs.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Stubs.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Stubs.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Syscalls.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Syscalls.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Syscalls.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Syscalls.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Syscalls.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Syscalls.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Syscalls.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Syscalls.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/SyscallsEnum.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/SyscallsEnum.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/SyscallsEnum.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/SyscallsEnum.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/SyscallsNames.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/SyscallsNames.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/SyscallsNames.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/SyscallsNames.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Thread.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Thread.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Thread.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Thread.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Thread.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Thread.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Thread.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Thread.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Time.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Time.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Time.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Time.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Timer.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Timer.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Timer.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Timer.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Types.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Types.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x32/Types.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x32/Types.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/EPoll.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/EPoll.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/EPoll.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/EPoll.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/FD.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/FD.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/FD.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/FD.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/IO.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/IO.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/IO.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/IO.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Info.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Info.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Info.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Info.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/HelperDefines.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/HelperDefines.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/HelperDefines.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/HelperDefines.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/amdgpu_drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/amdgpu_drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/amdgpu_drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/amdgpu_drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/asound.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/asound.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/asound.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/asound.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/asound.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/asound.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/asound.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/asound.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/drm.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/drm.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/drm.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/drm.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/ext_fs.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/ext_fs.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/ext_fs.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/ext_fs.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/ext_fs.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/ext_fs.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/ext_fs.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/ext_fs.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/f2fs.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/f2fs.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/f2fs.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/f2fs.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/f2fs.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/f2fs.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/f2fs.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/f2fs.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/input.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/input.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/input.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/input.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/input.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/input.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/input.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/input.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/joystick.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/joystick.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/joystick.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/joystick.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/joystick.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/joystick.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/joystick.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/joystick.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/msdos_fs.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/msdos_fs.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/msdos_fs.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/msdos_fs.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/msdos_fs.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/msdos_fs.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/msdos_fs.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/msdos_fs.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/msm_drm.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/msm_drm.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/msm_drm.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/msm_drm.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/sockios.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/sockios.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/sockios.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/sockios.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/sockios.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/sockios.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/sockios.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/sockios.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/wireless.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/wireless.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/wireless.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/wireless.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/wireless.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/wireless.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl/wireless.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Ioctl/wireless.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Memory.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Memory.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Memory.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Memory.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Msg.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Msg.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Msg.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Msg.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/NotImplemented.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/NotImplemented.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/NotImplemented.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/NotImplemented.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Sched.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Sched.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Sched.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Sched.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Semaphore.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Semaphore.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Semaphore.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Semaphore.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Signals.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Signals.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Signals.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Signals.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Socket.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Socket.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Socket.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Socket.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Syscalls.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Syscalls.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Syscalls.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Syscalls.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/SyscallsEnum.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/SyscallsEnum.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/SyscallsEnum.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/SyscallsEnum.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/SyscallsNames.inl b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/SyscallsNames.inl similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/SyscallsNames.inl rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/SyscallsNames.inl diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Thread.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Thread.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Thread.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Thread.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Thread.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Thread.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Thread.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Thread.h diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Time.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Time.cpp similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Time.cpp rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Time.cpp diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Types.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Types.h similarity index 100% rename from Source/Tools/FEXLoader/LinuxSyscalls/x64/Types.h rename to Source/Tools/LinuxEmulation/LinuxSyscalls/x64/Types.h diff --git a/Source/Tools/FEXLoader/VDSO_Emulation.cpp b/Source/Tools/LinuxEmulation/VDSO_Emulation.cpp similarity index 100% rename from Source/Tools/FEXLoader/VDSO_Emulation.cpp rename to Source/Tools/LinuxEmulation/VDSO_Emulation.cpp diff --git a/Source/Tools/FEXLoader/VDSO_Emulation.h b/Source/Tools/LinuxEmulation/VDSO_Emulation.h similarity index 100% rename from Source/Tools/FEXLoader/VDSO_Emulation.h rename to Source/Tools/LinuxEmulation/VDSO_Emulation.h