Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-22 20:59:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

disable NCE temporarily to fix mvk issues

Browse source 
Signed-off-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2025-10-20 00:32:57 +00:00
parent df4a609bb4
commit 019921c10a
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -313,7 +313,8 @@ if (YUZU_LEGACY)
add_compile_definitions(YUZU_LEGACY)
endif()
if (ARCHITECTURE_arm64 AND (ANDROID OR APPLE OR PLATFORM_LINUX))
# TODO: APPLE
if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))
set(HAS_NCE 1)
add_compile_definitions(HAS_NCE=1)
endif()

12
src/common/host_memory.cpp
View file

@ -397,8 +397,8 @@ private:
#else // ^^^ Windows ^^^ vvv POSIX vvv
#ifdef ARCHITECTURE_arm64
// Use NCE friendly mapping techniques
#if defined(ARCHITECTURE_arm64) && defined(HAS_NCE)
static void* ChooseVirtualBase(size_t virtual_size) {
constexpr uintptr_t Map36BitSize = (1ULL << 36);
#ifdef __APPLE__
@ -484,9 +484,7 @@ static void* ChooseVirtualBase(size_t virtual_size) {
return MAP_FAILED;
#endif
}
#else
static void* ChooseVirtualBase(size_t virtual_size) {
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun__) || defined(__HAIKU__) || defined(__managarm__) || defined(__AIX__)
void* virtual_base = mmap(nullptr, virtual_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_ALIGNED_SUPER, -1, 0);
@ -495,7 +493,6 @@ static void* ChooseVirtualBase(size_t virtual_size) {
#endif
return mmap(nullptr, virtual_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
}
#endif
#if defined(__sun__) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__)
@ -622,9 +619,10 @@ public:
prot_flags |= PROT_READ;
if (True(perms & MemoryPermission::Write))
prot_flags |= PROT_WRITE;
#ifdef ARCHITECTURE_arm64
// W^X only supported with NCE
#if defined(ARCHITECTURE_arm64) && defined(HAS_NCE)
if (True(perms & MemoryPermission::Execute))
prot_flags |= PROT_EXEC;
flags |= PROT_EXEC;
#endif
int flags = (fd > 0 ? MAP_SHARED : MAP_PRIVATE) | MAP_FIXED;
void* ret = mmap(virtual_base + virtual_offset, length, prot_flags, flags, fd, host_offset);