Browse Source

stupid swap system + exit_fn

eden-orbis-ps4
lizzie 2 weeks ago
parent
commit
3b449f289f
  1. 1
      src/common/host_memory.cpp
  2. 28
      src/common/virtual_buffer.cpp
  3. 1
      src/common/virtual_buffer.h
  4. 11
      src/yuzu_cmd/yuzu.cpp

1
src/common/host_memory.cpp

@ -701,6 +701,7 @@ private:
HostMemory::HostMemory(size_t backing_size_, size_t virtual_size_) : backing_size(backing_size_), virtual_size(virtual_size_) { HostMemory::HostMemory(size_t backing_size_, size_t virtual_size_) : backing_size(backing_size_), virtual_size(virtual_size_) {
#ifdef __OPENORBIS__ #ifdef __OPENORBIS__
Common::InitSwap();
LOG_WARNING(HW_Memory, "Platform doesn't support fastmem"); LOG_WARNING(HW_Memory, "Platform doesn't support fastmem");
fallback_buffer.emplace(backing_size); fallback_buffer.emplace(backing_size);
backing_base = fallback_buffer->data(); backing_base = fallback_buffer->data();

28
src/common/virtual_buffer.cpp

@ -10,6 +10,10 @@
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
#ifdef __OPENORBIS__
#include <csignal>
#endif
#include "common/assert.h" #include "common/assert.h"
#include "common/virtual_buffer.h" #include "common/virtual_buffer.h"
#include "common/logging/log.h" #include "common/logging/log.h"
@ -33,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_ANON | MAP_PRIVATE, -1, 0);
void* addr = mmap(nullptr, size, PROT_READ | PROT_WRITE, 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);
@ -53,4 +57,26 @@ void FreeMemoryPages(void* addr, [[maybe_unused]] std::size_t size) noexcept {
#endif #endif
} }
#ifdef __OPENORBIS__
static struct sigaction old_sa_segv;
static void SwapHandler(int sig, siginfo_t* si, void* raw_context) {
void* a_addr = reinterpret_cast<void*>(uintptr_t(si->si_addr) & ~0xfff);
mmap(a_addr, 4096, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
//mprotect(a_addr, 4096, PROT_READ | PROT_WRITE);
}
bool InitSwap() noexcept {
struct sigaction sa;
sa.sa_handler = NULL;
sa.sa_sigaction = &SwapHandler;
sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_SIGINFO | SA_RESTART;
return sigaction(SIGSEGV, &sa, &old_sa_segv) == 0;
}
#else
bool InitSwap() noexcept {
return true;
}
#endif
} // namespace Common } // namespace Common

1
src/common/virtual_buffer.h

@ -12,6 +12,7 @@ namespace Common {
void* AllocateMemoryPages(std::size_t size) noexcept; void* AllocateMemoryPages(std::size_t size) noexcept;
void FreeMemoryPages(void* base, std::size_t size) noexcept; void FreeMemoryPages(void* base, std::size_t size) noexcept;
bool InitSwap() noexcept;
template <typename T> template <typename T>
class VirtualBuffer final { class VirtualBuffer final {

11
src/yuzu_cmd/yuzu.cpp

@ -52,6 +52,7 @@
#endif #endif
#ifdef __OPENORBIS__ #ifdef __OPENORBIS__
#include <orbis/SystemService.h>
# define STUB_WEAK(name) extern "C" void name() { printf("called " #name); asm volatile("ud2"); } # define STUB_WEAK(name) extern "C" void name() { printf("called " #name); asm volatile("ud2"); }
STUB_WEAK(__cxa_thread_atexit) STUB_WEAK(__cxa_thread_atexit)
STUB_WEAK(__assert) STUB_WEAK(__assert)
@ -433,10 +434,15 @@ int main(int argc, char** argv) {
[](VideoCore::LoadCallbackStage, size_t value, size_t total) {}); [](VideoCore::LoadCallbackStage, size_t value, size_t total) {});
} }
system.RegisterExitCallback([&] {
auto const exit_fn = [&] {
#ifdef __OPENORBIS__
sceSystemServiceLoadExec("EXIT", nullptr);
#else
// Just exit right away. // Just exit right away.
exit(0); exit(0);
});
#endif
};
system.RegisterExitCallback(exit_fn);
#ifdef __linux__ #ifdef __linux__
Common::Linux::StartGamemode(); Common::Linux::StartGamemode();
@ -458,6 +464,7 @@ int main(int argc, char** argv) {
#endif #endif
detached_tasks.WaitForAllTasks(); detached_tasks.WaitForAllTasks();
exit_fn();
return 0; return 0;
} }

Loading…
Cancel
Save