mirror of
https://github.com/FEX-Emu/FEX.git
synced 2026-10-10 00:00:19 +02:00
Ryan Houdek
151e2279af
Reimagining of #3355 without any json generators or new concepts. Fixes some mislabeling of system calls. Some getting inlined when they shouldn't be, a lot not getting inlined when they can be. This really cleans up the syscall implementation, all syscalls that can be passthrough implementations require a very small two line declaration. Additionally cleans up a bit of implementation cruft where some passthrough syscalls were using the glibc syscall handler, and some were using the glibc implementation. We have had multiple issues in the past where the glibc implementation does something subtly different than the raw syscall and breaks things. Now all passthrough handlers do a system call directly, removing at least one indirection and some ambiguity. This makes it significantly easier to add new passthrough syscalls as well. Only need to do a version check and add the three lines per syscall. Which there are new syscalls incoming that we will want to add. Tangible improvements: - Syscalls are lower overhead than ever. - When I'm adding more syscalls I have less chance of mucking it up.
173 lines
5.7 KiB
CMake
173 lines
5.7 KiB
CMake
add_compile_options(-fno-operator-names)
|
|
|
|
set (SRCS
|
|
VDSO_Emulation.cpp
|
|
LinuxSyscalls/GdbServer.cpp
|
|
LinuxSyscalls/EmulatedFiles/EmulatedFiles.cpp
|
|
LinuxSyscalls/FaultSafeMemcpy.cpp
|
|
LinuxSyscalls/FileManagement.cpp
|
|
LinuxSyscalls/LinuxAllocator.cpp
|
|
LinuxSyscalls/NetStream.cpp
|
|
LinuxSyscalls/SignalDelegator.cpp
|
|
LinuxSyscalls/Syscalls.cpp
|
|
LinuxSyscalls/SyscallsSMCTracking.cpp
|
|
LinuxSyscalls/SyscallsVMATracking.cpp
|
|
LinuxSyscalls/ThreadManager.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/Info.cpp
|
|
LinuxSyscalls/x64/Memory.cpp
|
|
LinuxSyscalls/x64/NotImplemented.cpp
|
|
LinuxSyscalls/x64/Semaphore.cpp
|
|
LinuxSyscalls/x64/Signals.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/Passthrough.cpp
|
|
LinuxSyscalls/Syscalls/Info.cpp
|
|
LinuxSyscalls/Syscalls/IO.cpp
|
|
LinuxSyscalls/Syscalls/Memory.cpp
|
|
LinuxSyscalls/Syscalls/Signals.cpp
|
|
LinuxSyscalls/Syscalls/Thread.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*")
|