Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Thunks: Implement support for 32-bit Vulkan thunking #2294

Closed
wants to merge 8 commits into from
Closed

Thunks: Implement support for 32-bit Vulkan thunking #2294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b81d430
Thunks/gen: Print stacktrace on crash
neobrain Dec 28, 2022
c340208
Thunks: Add IS_32BIT_THUNK preprocessor define
neobrain Dec 28, 2022
6d4305f
Thunks/gen: Add support for assisted automatic repacking of structs
neobrain Dec 28, 2022
6e7b033
Thunks/gen: Add support for opaque types
neobrain Dec 28, 2022
851cd84
Thunks: Add fake thunk library for unit testing
neobrain Dec 28, 2022
d326b37
libfex_thunk_test: Test struct repacking for Vulkan-like structures
neobrain Dec 28, 2022
4fa6f3a
libfex_thunk_test: Add opaque type test
neobrain Dec 28, 2022
6402bfc
Thunks/vulkan: Disable API that is not yet supported by auto-repacking
neobrain Dec 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Data/ThunksDB.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,14 @@
"@PREFIX_LIB@/@PREFIX_ARCH@-linux-gnu/libasound.so.2.0.0"
]
},
"fex_thunk_test": {
"Library": "libfex_thunk_test-guest.so",
"Overlay": [
"@PREFIX_LIB@/@PREFIX_ARCH@-linux-gnu/libfex_thunk_test.so",
"@PREFIX_LIB@/@PREFIX_ARCH@-linux-gnu/libfex_thunk_test.so.0",
"@PREFIX_LIB@/@PREFIX_ARCH@-linux-gnu/libfex_thunk_test.so.0.0.0"
]
},
"Xrender": {
"Library": "libXrender-guest.so",
"Overlay": [
Expand Down
10 changes: 5 additions & 5 deletions Source/Tests/LinuxSyscalls/FileManagement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,16 +361,16 @@ std::string FileManager::GetEmulatedPath(const char *pathname, bool FollowSymlin
return {};
}

auto thunkOverlay = ThunkOverlays.find(pathname);
if (thunkOverlay != ThunkOverlays.end()) {
return thunkOverlay->second;
}

auto RootFSPath = LDPath();
if (RootFSPath.empty()) { // If RootFS doesn't exist
return {};
}

auto thunkOverlay = ThunkOverlays.find(pathname);
if (thunkOverlay != ThunkOverlays.end()) {
return thunkOverlay->second;
}

std::string Path = RootFSPath + pathname;
if (FollowSymlink) {
char Filename[PATH_MAX];
Expand Down
444 changes: 361 additions & 83 deletions ThunkLibs/Generator/gen.cpp
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions ThunkLibs/Generator/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include "clang/Tooling/Tooling.h"
#include "clang/Tooling/CompilationDatabase.h"

#include "llvm/Support/Signals.h"

#include <iostream>
#include <string>

Expand All @@ -13,6 +15,8 @@ void print_usage(const char* program_name) {
}

int main(int argc, char* argv[]) {
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);

if (argc < 6) {
print_usage(argv[0]);
return EXIT_FAILURE;
Expand Down
185 changes: 94 additions & 91 deletions ThunkLibs/GuestLibs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,125 +154,128 @@ endfunction()

# These thunks only support 64-bit
if (BITNESS EQUAL 64)
#add_guest_lib(fex_malloc_loader)
#target_link_libraries(fex_malloc_loader-guest PRIVATE dl)
##add_guest_lib(fex_malloc_loader)
##target_link_libraries(fex_malloc_loader-guest PRIVATE dl)

#generate(libfex_malloc)
#add_guest_lib(fex_malloc)
##generate(libfex_malloc)
##add_guest_lib(fex_malloc)

generate(libasound ${CMAKE_CURRENT_SOURCE_DIR}/../libasound/libasound_interface.cpp)
add_guest_lib(asound "libasound.so.2")
#generate(libasound ${CMAKE_CURRENT_SOURCE_DIR}/../libasound/libasound_interface.cpp)
#add_guest_lib(asound "libasound.so.2")

generate(libEGL ${CMAKE_CURRENT_SOURCE_DIR}/../libEGL/libEGL_interface.cpp)
add_guest_lib(EGL "libEGL.so.1")
#generate(libEGL ${CMAKE_CURRENT_SOURCE_DIR}/../libEGL/libEGL_interface.cpp)
#add_guest_lib(EGL "libEGL.so.1")

generate(libGL ${CMAKE_CURRENT_SOURCE_DIR}/../libGL/libGL_interface.cpp)
add_guest_lib(GL "libGL.so.1")
#generate(libGL ${CMAKE_CURRENT_SOURCE_DIR}/../libGL/libGL_interface.cpp)
#add_guest_lib(GL "libGL.so.1")

# libGL must pull in libX11.so, so generate a placeholder libX11.so to link against
add_library(X11 SHARED ../libX11/libX11_NativeGuest.cpp)
target_link_libraries(GL-guest PRIVATE X11)
## libGL must pull in libX11.so, so generate a placeholder libX11.so to link against
#add_library(X11 SHARED ../libX11/libX11_NativeGuest.cpp)
#target_link_libraries(GL-guest PRIVATE X11)

# disabled for now, headers are platform specific
# find_package(SDL2 REQUIRED)
# generate(libSDL2)
# add_guest_lib(SDL2)
# target_include_directories(SDL2-guest PRIVATE ${SDL2_INCLUDE_DIRS})
# target_link_libraries(SDL2-guest PRIVATE GL)
# target_link_libraries(SDL2-guest PRIVATE dl)
## disabled for now, headers are platform specific
## find_package(SDL2 REQUIRED)
## generate(libSDL2)
## add_guest_lib(SDL2)
## target_include_directories(SDL2-guest PRIVATE ${SDL2_INCLUDE_DIRS})
## target_link_libraries(SDL2-guest PRIVATE GL)
## target_link_libraries(SDL2-guest PRIVATE dl)

find_package(PkgConfig)
pkg_search_module(X11 REQUIRED x11)
#find_package(PkgConfig)
#pkg_search_module(X11 REQUIRED x11)

string(REGEX MATCH "([0-9]*)\.([0-9]*)\.([0-9]*)" _ "${X11_VERSION}")
set(X11_VERSION_MAJOR ${CMAKE_MATCH_1})
set(X11_VERSION_MINOR ${CMAKE_MATCH_2})
set(X11_VERSION_PATCH ${CMAKE_MATCH_3})
#string(REGEX MATCH "([0-9]*)\.([0-9]*)\.([0-9]*)" _ "${X11_VERSION}")
#set(X11_VERSION_MAJOR ${CMAKE_MATCH_1})
#set(X11_VERSION_MINOR ${CMAKE_MATCH_2})
#set(X11_VERSION_PATCH ${CMAKE_MATCH_3})

generate(libX11 ${CMAKE_CURRENT_SOURCE_DIR}/../libX11/libX11_interface.cpp)
add_guest_lib(X11 "libX11.so.6")
#generate(libX11 ${CMAKE_CURRENT_SOURCE_DIR}/../libX11/libX11_interface.cpp)
#add_guest_lib(X11 "libX11.so.6")

target_compile_definitions(libX11-guest-deps INTERFACE -DX11_VERSION_MAJOR=${X11_VERSION_MAJOR})
target_compile_definitions(libX11-guest-deps INTERFACE -DX11_VERSION_MINOR=${X11_VERSION_MINOR})
target_compile_definitions(libX11-guest-deps INTERFACE -DX11_VERSION_PATCH=${X11_VERSION_PATCH})
#target_compile_definitions(libX11-guest-deps INTERFACE -DX11_VERSION_MAJOR=${X11_VERSION_MAJOR})
#target_compile_definitions(libX11-guest-deps INTERFACE -DX11_VERSION_MINOR=${X11_VERSION_MINOR})
#target_compile_definitions(libX11-guest-deps INTERFACE -DX11_VERSION_PATCH=${X11_VERSION_PATCH})

generate(libXext ${CMAKE_CURRENT_SOURCE_DIR}/../libXext/libXext_interface.cpp)
add_guest_lib(Xext "libXext.so.6")
#generate(libXext ${CMAKE_CURRENT_SOURCE_DIR}/../libXext/libXext_interface.cpp)
#add_guest_lib(Xext "libXext.so.6")

target_compile_definitions(libXext-guest-deps INTERFACE -DX11_VERSION_MAJOR=${X11_VERSION_MAJOR})
target_compile_definitions(libXext-guest-deps INTERFACE -DX11_VERSION_MINOR=${X11_VERSION_MINOR})
target_compile_definitions(libXext-guest-deps INTERFACE -DX11_VERSION_PATCH=${X11_VERSION_PATCH})
#target_compile_definitions(libXext-guest-deps INTERFACE -DX11_VERSION_MAJOR=${X11_VERSION_MAJOR})
#target_compile_definitions(libXext-guest-deps INTERFACE -DX11_VERSION_MINOR=${X11_VERSION_MINOR})
#target_compile_definitions(libXext-guest-deps INTERFACE -DX11_VERSION_PATCH=${X11_VERSION_PATCH})

generate(libXrender ${CMAKE_CURRENT_SOURCE_DIR}/../libXrender/libXrender_interface.cpp)
add_guest_lib(Xrender "libXrender.so.1")
#generate(libXrender ${CMAKE_CURRENT_SOURCE_DIR}/../libXrender/libXrender_interface.cpp)
#add_guest_lib(Xrender "libXrender.so.1")

generate(libXfixes ${CMAKE_CURRENT_SOURCE_DIR}/../libXfixes/libXfixes_interface.cpp)
add_guest_lib(Xfixes "libXfixes.so.3")
#generate(libXfixes ${CMAKE_CURRENT_SOURCE_DIR}/../libXfixes/libXfixes_interface.cpp)
#add_guest_lib(Xfixes "libXfixes.so.3")

generate(libvulkan ${CMAKE_CURRENT_SOURCE_DIR}/../libvulkan/libvulkan_interface.cpp)
target_include_directories(libvulkan-guest-deps INTERFACE ${FEX_PROJECT_SOURCE_DIR}/External/Vulkan-Headers/include/)
add_guest_lib(vulkan "libvulkan.so.1")

generate(libxcb ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb/libxcb_interface.cpp)
add_guest_lib(xcb "libxcb.so.1")
#generate(libxcb ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb/libxcb_interface.cpp)
#add_guest_lib(xcb "libxcb.so.1")

generate(libxcb-dri2 ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-dri2/libxcb-dri2_interface.cpp)
add_guest_lib(xcb-dri2 "libxcb-dri2.so.0")
#generate(libxcb-dri2 ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-dri2/libxcb-dri2_interface.cpp)
#add_guest_lib(xcb-dri2 "libxcb-dri2.so.0")

generate(libxcb-dri3 ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-dri3/libxcb-dri3_interface.cpp)
add_guest_lib(xcb-dri3 "libxcb-dri3.so.0")
#generate(libxcb-dri3 ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-dri3/libxcb-dri3_interface.cpp)
#add_guest_lib(xcb-dri3 "libxcb-dri3.so.0")

generate(libxcb-xfixes ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-xfixes/libxcb-xfixes_interface.cpp)
add_guest_lib(xcb-xfixes "libxcb-xfixes.so.0")
#generate(libxcb-xfixes ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-xfixes/libxcb-xfixes_interface.cpp)
#add_guest_lib(xcb-xfixes "libxcb-xfixes.so.0")

generate(libxcb-shm ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-shm/libxcb-shm_interface.cpp)
add_guest_lib(xcb-shm "libxcb-shm.so.0")
#generate(libxcb-shm ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-shm/libxcb-shm_interface.cpp)
#add_guest_lib(xcb-shm "libxcb-shm.so.0")

generate(libxcb-sync ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-sync/libxcb-sync_interface.cpp)
add_guest_lib(xcb-sync "libxcb-sync.so.1")
#generate(libxcb-sync ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-sync/libxcb-sync_interface.cpp)
#add_guest_lib(xcb-sync "libxcb-sync.so.1")

generate(libxcb-present ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-present/libxcb-present_interface.cpp)
add_guest_lib(xcb-present "libxcb-present.so.0")
#generate(libxcb-present ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-present/libxcb-present_interface.cpp)
#add_guest_lib(xcb-present "libxcb-present.so.0")

generate(libxcb-randr ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-randr/libxcb-randr_interface.cpp)
add_guest_lib(xcb-randr "libxcb-randr.so.0")
#generate(libxcb-randr ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-randr/libxcb-randr_interface.cpp)
#add_guest_lib(xcb-randr "libxcb-randr.so.0")

generate(libxcb-glx ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-glx/libxcb-glx_interface.cpp)
add_guest_lib(xcb-glx "libxcb-glx.so.0")
#generate(libxcb-glx ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-glx/libxcb-glx_interface.cpp)
#add_guest_lib(xcb-glx "libxcb-glx.so.0")

generate(libxshmfence ${CMAKE_CURRENT_SOURCE_DIR}/../libxshmfence/libxshmfence_interface.cpp)
add_guest_lib(xshmfence "libxshmfence.so.1")
#generate(libxshmfence ${CMAKE_CURRENT_SOURCE_DIR}/../libxshmfence/libxshmfence_interface.cpp)
#add_guest_lib(xshmfence "libxshmfence.so.1")

generate(libdrm ${CMAKE_CURRENT_SOURCE_DIR}/../libdrm/libdrm_interface.cpp)
target_include_directories(libdrm-guest-deps INTERFACE /usr/include/drm/)
target_include_directories(libdrm-guest-deps INTERFACE /usr/include/libdrm/)
add_guest_lib(drm "libdrm.so.2")
#generate(libdrm ${CMAKE_CURRENT_SOURCE_DIR}/../libdrm/libdrm_interface.cpp)
#target_include_directories(libdrm-guest-deps INTERFACE /usr/include/drm/)
#target_include_directories(libdrm-guest-deps INTERFACE /usr/include/libdrm/)
#add_guest_lib(drm "libdrm.so.2")
endif()

generate(libVDSO ${CMAKE_CURRENT_SOURCE_DIR}/../libVDSO/libVDSO_interface.cpp)
add_guest_lib(VDSO "linux-vdso.so.1")
# Can't use a stack protector because otherwise cross-compiling fails
# Not necessary anyway because it only trampolines
target_compile_options(VDSO-guest PRIVATE "-fno-stack-protector")
target_link_options(VDSO-guest PRIVATE "-nostdlib" "LINKER:--no-undefined" "LINKER:-z,max-page-size=4096" "LINKER:--hash-style=both")

if (BITNESS EQUAL 32)
# 32-bit entrypoint points to __kernel_vsyscall and needs to exist
target_link_options(VDSO-guest PRIVATE "LINKER:-e,__kernel_vsyscall")
# 32-bit VDSO needs to have PIC disabled.
# Otherwise GCC/Clang generates GOT prologues on the functions that corrupt vsyscall.
# Correct:
# 00000350 <__kernel_vsyscall>:
# 350: cd 80 int 0x80
# 352: c3 ret
# 353: 0f 0b ud2
# Incorrect:
# 0000032a <__kernel_vsyscall>:
# 32a: e8 0b 00 00 00 call 33a <__x86.get_pc_thunk.ax>
# 32f: 05 79 03 00 00 add eax,0x379
# 334: cd 80 int 0x80
# 336: c3 ret
# 337: 90 nop
# 338: 0f 0b ud2
target_compile_options(VDSO-guest PRIVATE "-fno-pic")
endif()
#generate(libVDSO ${CMAKE_CURRENT_SOURCE_DIR}/../libVDSO/libVDSO_interface.cpp)
#add_guest_lib(VDSO "linux-vdso.so.1")
## Can't use a stack protector because otherwise cross-compiling fails
## Not necessary anyway because it only trampolines
#target_compile_options(VDSO-guest PRIVATE "-fno-stack-protector")
#target_link_options(VDSO-guest PRIVATE "-nostdlib" "LINKER:--no-undefined" "LINKER:-z,max-page-size=4096" "LINKER:--hash-style=both")

#if (BITNESS EQUAL 32)
## 32-bit entrypoint points to __kernel_vsyscall and needs to exist
#target_link_options(VDSO-guest PRIVATE "LINKER:-e,__kernel_vsyscall")
## 32-bit VDSO needs to have PIC disabled.
## Otherwise GCC/Clang generates GOT prologues on the functions that corrupt vsyscall.
## Correct:
## 00000350 <__kernel_vsyscall>:
## 350: cd 80 int 0x80
## 352: c3 ret
## 353: 0f 0b ud2
## Incorrect:
## 0000032a <__kernel_vsyscall>:
## 32a: e8 0b 00 00 00 call 33a <__x86.get_pc_thunk.ax>
## 32f: 05 79 03 00 00 add eax,0x379
## 334: cd 80 int 0x80
## 336: c3 ret
## 337: 90 nop
## 338: 0f 0b ud2
#target_compile_options(VDSO-guest PRIVATE "-fno-pic")
#endif()

generate(libfex_thunk_test ${CMAKE_CURRENT_SOURCE_DIR}/../libfex_thunk_test/libfex_thunk_test_interface.cpp)
add_guest_lib(fex_thunk_test "libfex_thunk_test.so.0")
Loading