liberodark/eden
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 0fda930b33
commit aaf319bf30
No known key found for this signature in database
GPG key ID: 00287378CADCAB13
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -359,7 +359,8 @@ if (YUZU_LEGACY)
add_compile_definitions(YUZU_LEGACY) add_compile_definitions(YUZU_LEGACY)
endif() 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) set(HAS_NCE 1)
add_compile_definitions(HAS_NCE=1) add_compile_definitions(HAS_NCE=1)
endif() endif()

18
src/common/host_memory.cpp
View file

@ -397,8 +397,8 @@ private:
#elif defined(__linux__) || defined(__FreeBSD__) || defined(__sun__) || defined(__APPLE__) // ^^^ Windows ^^^ vvv POSIX vvv #elif defined(__linux__) || defined(__FreeBSD__) || defined(__sun__) || defined(__APPLE__) // ^^^ 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) { static void* ChooseVirtualBase(size_t virtual_size) {
constexpr uintptr_t Map36BitSize = (1ULL << 36); constexpr uintptr_t Map36BitSize = (1ULL << 36);
#ifdef __APPLE__ #ifdef __APPLE__
@ -484,9 +484,7 @@ static void* ChooseVirtualBase(size_t virtual_size) {
return MAP_FAILED; return MAP_FAILED;
#endif #endif
} }
#else #else
static void* ChooseVirtualBase(size_t virtual_size) { static void* ChooseVirtualBase(size_t virtual_size) {
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun__) || defined(__HAIKU__) || defined(__managarm__) || defined(__AIX__) #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); 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 #endif
return mmap(nullptr, virtual_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0); return mmap(nullptr, virtual_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
} }
#endif #endif
#if defined(__sun__) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__) #if defined(__sun__) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__)
@ -609,14 +606,19 @@ public:
if (True(perms & MemoryPermission::Write)) { if (True(perms & MemoryPermission::Write)) {
flags |= PROT_WRITE; flags |= PROT_WRITE;
} }
#ifdef ARCHITECTURE_arm64 // W^X and stuff only supported with NCE
#if defined(ARCHITECTURE_arm64) && defined(HAS_NCE)
if (True(perms & MemoryPermission::Execute)) { if (True(perms & MemoryPermission::Execute)) {
flags |= PROT_EXEC; flags |= PROT_EXEC;
} }
#endif #endif
void* ret = mmap(virtual_base + virtual_offset, length, flags, MAP_SHARED | MAP_FIXED, fd, #if defined(ARCHITECTURE_arm64) && defined(__APPLE__)
host_offset); length = ((length / 16384) + 1) * 16384;
void* ret = mmap(virtual_base + (virtual_offset & ~16383), length, flags, MAP_SHARED | MAP_FIXED, fd, host_offset);
#else
void* ret = mmap(virtual_base + virtual_offset, length, flags, MAP_SHARED | MAP_FIXED, fd, host_offset);
#endif
ASSERT_MSG(ret != MAP_FAILED, "mmap failed: {}", strerror(errno)); ASSERT_MSG(ret != MAP_FAILED, "mmap failed: {}", strerror(errno));
} }