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

fixes 4 stuff

Browse source
This commit is contained in:
lizzie 2025-12-06 23:02:09 +00:00
parent 4fe78fa2a7
commit a2982c5e3b
4 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/common/virtual_buffer.cpp
View file

@ -37,7 +37,7 @@ void* AllocateMemoryPages(std::size_t size) noexcept {
void* addr = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE); void* addr = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE);
ASSERT(addr != nullptr); ASSERT(addr != nullptr);
#elif defined(__OPENORBIS__) #elif defined(__OPENORBIS__)
void* addr = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_VOID | MAP_PRIVATE, -1, 0); void* addr = mmap(nullptr, size, PROT_NONE, MAP_VOID | MAP_PRIVATE, -1, 0);
ASSERT(addr != MAP_FAILED); ASSERT(addr != MAP_FAILED);
#else #else
void* addr = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0); void* addr = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
@ -60,15 +60,15 @@ void FreeMemoryPages(void* addr, [[maybe_unused]] std::size_t size) noexcept {
#ifdef __OPENORBIS__ #ifdef __OPENORBIS__
static struct sigaction old_sa_segv; static struct sigaction old_sa_segv;
static void SwapHandler(int sig, siginfo_t* si, void* raw_context) { static void SwapHandler(int sig, siginfo_t* si, void* raw_context) {
void* a_addr = reinterpret_cast<void*>(uintptr_t(si->si_addr) & ~0xfff); void* aligned_addr = reinterpret_cast<void*>(uintptr_t(si->si_addr) & ~0xfff);
mmap(a_addr, 4096, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0); void* res = mmap(aligned_addr, 4096, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);
//mprotect(a_addr, 4096, PROT_READ | PROT_WRITE); ASSERT(res != MAP_FAILED);
} }
bool InitSwap() noexcept { bool InitSwap() noexcept {
struct sigaction sa; struct sigaction sa;
sa.sa_handler = NULL; sa.sa_handler = NULL;
sa.sa_sigaction = &SwapHandler; sa.__sa_handler.__sa_sigaction = &SwapHandler;
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_SIGINFO | SA_RESTART; sa.sa_flags = SA_SIGINFO | SA_RESTART;
return sigaction(SIGSEGV, &sa, &old_sa_segv) == 0; return sigaction(SIGSEGV, &sa, &old_sa_segv) == 0;

4
src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp
View file

@ -85,11 +85,7 @@ size_t KSystemControl::Init::GetIntendedMemorySize() {
switch (GetMemorySizeForInit()) { switch (GetMemorySizeForInit()) {
case Smc::MemorySize_4GB: case Smc::MemorySize_4GB:
default: // All invalid modes should go to 4GB. default: // All invalid modes should go to 4GB.
#ifdef __OPENORBIS__
return 2_GiB;
#else
return 4_GiB; return 4_GiB;
#endif
case Smc::MemorySize_6GB: case Smc::MemorySize_6GB:
return 6_GiB; return 6_GiB;
case Smc::MemorySize_8GB: case Smc::MemorySize_8GB:

2
src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp
View file

@ -60,7 +60,7 @@ public:
signal_stack_memory = mmap(nullptr, signal_stack_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); signal_stack_memory = mmap(nullptr, signal_stack_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
#ifdef __OPENORBIS__ #ifdef __OPENORBIS__
fmt::print(stderr, "no fastmem on ps4\n"); fmt::print(stderr, "no fastmem on PS4\n");
supports_fast_mem = false; supports_fast_mem = false;
#else #else
stack_t signal_stack{}; stack_t signal_stack{};

2
src/yuzu_cmd/CMakeLists.txt
View file

@ -35,7 +35,7 @@ target_link_libraries(yuzu-cmd PRIVATE glad)
if (MSVC) if (MSVC)
target_link_libraries(yuzu-cmd PRIVATE getopt) target_link_libraries(yuzu-cmd PRIVATE getopt)
elseif(PLATFORM_PS4) elseif(PLATFORM_PS4)
target_link_libraries(yuzu-cmd PRIVATE SceVideoOut SceAudioOut ScePad) target_link_libraries(yuzu-cmd PRIVATE SceVideoOut SceAudioOut ScePad SceSystemService)
endif() endif()
target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)