Browse Source
[compat] more openbsd fixes for w^x
Signed-off-by: lizzie <lizzie@eden-emu.dev>
pull/273/head
lizzie
7 months ago
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
4 changed files with
20 additions and
11 deletions
-
docs/build/OpenBSD.md
-
externals/CMakeLists.txt
-
src/dynarmic/CMakeLists.txt
-
src/dynarmic/src/dynarmic/backend/x64/block_of_code.cpp
|
|
|
@ -2,14 +2,9 @@ |
|
|
|
|
|
|
|
```sh |
|
|
|
pkg_add -u |
|
|
|
pkg_add cmake nasm git boost unzip--iconv autoconf-2.72p0 bash ffmpeg glslang g++-11.2.0p18 gmake |
|
|
|
pkg_add cmake nasm git boost unzip--iconv autoconf-2.72p0 bash ffmpeg glslang gmake llvm-19.1.7p3 |
|
|
|
git --recursive https://git.eden-emu.dev/eden-emu/eden |
|
|
|
``` |
|
|
|
|
|
|
|
Select g++-11.2. The compiler can then be invoked via `ec++`. |
|
|
|
|
|
|
|
```sh |
|
|
|
cmake -DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_QT=OFF -DENABLE_OPENSSL=OFF -DENABLE_WEB_SERVICE=OFF -B /usr/obj/eden |
|
|
|
cmake -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_QT=OFF -DENABLE_OPENSSL=OFF -DENABLE_WEB_SERVICE=OFF -B /usr/obj/eden |
|
|
|
``` |
|
|
|
|
|
|
|
- Modify `externals/ffmpeg/CMakeFiles/ffmpeg-build/build.make` to use `-j$(nproc)` instead of just `-j`. |
|
|
|
@ -33,7 +33,7 @@ endif() |
|
|
|
|
|
|
|
# Xbyak (also used by Dynarmic, so needs to be added first) |
|
|
|
if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) |
|
|
|
if (PLATFORM_SUN) |
|
|
|
if (PLATFORM_SUN OR PLATFORM_OPENBSD) |
|
|
|
AddJsonPackage(xbyak_sun) |
|
|
|
else() |
|
|
|
AddJsonPackage(xbyak) |
|
|
|
|
|
|
|
@ -14,12 +14,20 @@ endif() |
|
|
|
|
|
|
|
# Dynarmic project options |
|
|
|
option(DYNARMIC_ENABLE_CPU_FEATURE_DETECTION "Turning this off causes dynarmic to assume the host CPU doesn't support anything later than SSE3" ON) |
|
|
|
option(DYNARMIC_ENABLE_NO_EXECUTE_SUPPORT "Enables support for systems that require W^X" OFF) |
|
|
|
if (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") |
|
|
|
option(DYNARMIC_ENABLE_NO_EXECUTE_SUPPORT "Enables support for systems that require W^X" ON) |
|
|
|
else() |
|
|
|
option(DYNARMIC_ENABLE_NO_EXECUTE_SUPPORT "Enables support for systems that require W^X" OFF) |
|
|
|
endif() |
|
|
|
option(DYNARMIC_FATAL_ERRORS "Errors are fatal" OFF) |
|
|
|
option(DYNARMIC_IGNORE_ASSERTS "Ignore asserts" OFF) |
|
|
|
option(DYNARMIC_TESTS_USE_UNICORN "Enable fuzzing tests against unicorn" OFF) |
|
|
|
option(DYNARMIC_USE_LLVM "Support disassembly of jitted x86_64 code using LLVM" OFF) |
|
|
|
option(DYNARMIC_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON) |
|
|
|
if (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") |
|
|
|
option(DYNARMIC_USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF) |
|
|
|
else() |
|
|
|
option(DYNARMIC_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON) |
|
|
|
endif() |
|
|
|
option(DYNARMIC_INSTALL "Install dynarmic headers and CMake files" OFF) |
|
|
|
option(DYNARMIC_USE_BUNDLED_EXTERNALS "Use all bundled externals (useful when e.g. cross-compiling)" OFF) |
|
|
|
option(DYNARMIC_WARNINGS_AS_ERRORS "Warnings as errors" ${MASTER_PROJECT}) |
|
|
|
|
|
|
|
@ -225,8 +225,14 @@ bool IsUnderRosetta() { |
|
|
|
|
|
|
|
} // anonymous namespace
|
|
|
|
|
|
|
|
#ifdef __OpenBSD__
|
|
|
|
constexpr auto default_cg_mode = Xbyak::DontSetProtectRWE; |
|
|
|
#else
|
|
|
|
constexpr auto default_cg_mode = nullptr; //Allow RWE
|
|
|
|
#endif
|
|
|
|
|
|
|
|
BlockOfCode::BlockOfCode(RunCodeCallbacks cb, JitStateInfo jsi, size_t total_code_size, std::function<void(BlockOfCode&)> rcp) |
|
|
|
: Xbyak::CodeGenerator(total_code_size, nullptr, &s_allocator) |
|
|
|
: Xbyak::CodeGenerator(total_code_size, default_cg_mode, &s_allocator) |
|
|
|
, cb(std::move(cb)) |
|
|
|
, jsi(jsi) |
|
|
|
, constant_pool(*this, CONSTANT_POOL_SIZE) |
|
|
|
|
