Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-31 11:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CPU/Recompiler: Disable static code buffer on macOS/Haiku

Browse source
This commit is contained in:
Connor McLaughlin 2020-08-22 13:24:57 +10:00
parent eb002f7e3e
commit 1d4d1d06a7
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/cpu_code_cache.cpp
View file

@ -18,13 +18,21 @@ namespace CPU::CodeCache {
constexpr bool USE_BLOCK_LINKING = true; constexpr bool USE_BLOCK_LINKING = true;
#ifdef WITH_RECOMPILER #ifdef WITH_RECOMPILER
// Currently remapping the code buffer doesn't work in macOS or Haiku.
#if !defined(__HAIKU__) && !defined(__APPLE__)
#define USE_STATIC_CODE_BUFFER 1
#endif
static constexpr u32 RECOMPILER_CODE_CACHE_SIZE = 32 * 1024 * 1024; static constexpr u32 RECOMPILER_CODE_CACHE_SIZE = 32 * 1024 * 1024;
static constexpr u32 RECOMPILER_FAR_CODE_CACHE_SIZE = 32 * 1024 * 1024; static constexpr u32 RECOMPILER_FAR_CODE_CACHE_SIZE = 32 * 1024 * 1024;
#ifndef __HAIKU__
#ifdef USE_STATIC_CODE_BUFFER
static constexpr u32 RECOMPILER_GUARD_SIZE = 4096; static constexpr u32 RECOMPILER_GUARD_SIZE = 4096;
alignas(Recompiler::CODE_STORAGE_ALIGNMENT) static u8 alignas(Recompiler::CODE_STORAGE_ALIGNMENT) static u8
s_code_storage[RECOMPILER_CODE_CACHE_SIZE + RECOMPILER_FAR_CODE_CACHE_SIZE]; s_code_storage[RECOMPILER_CODE_CACHE_SIZE + RECOMPILER_FAR_CODE_CACHE_SIZE];
#endif #endif
static JitCodeBuffer s_code_buffer; static JitCodeBuffer s_code_buffer;
enum : u32 enum : u32
@ -92,7 +100,7 @@ void Initialize(bool use_recompiler)
#ifdef WITH_RECOMPILER #ifdef WITH_RECOMPILER
s_use_recompiler = use_recompiler; s_use_recompiler = use_recompiler;
#ifndef __HAIKU__ #ifdef USE_STATIC_CODE_BUFFER
if (!s_code_buffer.Initialize(s_code_storage, sizeof(s_code_storage), RECOMPILER_FAR_CODE_CACHE_SIZE, if (!s_code_buffer.Initialize(s_code_storage, sizeof(s_code_storage), RECOMPILER_FAR_CODE_CACHE_SIZE,
RECOMPILER_GUARD_SIZE)) RECOMPILER_GUARD_SIZE))
#else #else