From 9d3d1c55f139e51838b5506a554df0032aeb6414 Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 1 Apr 2026 00:48:41 +0000 Subject: [PATCH] proper virtual base, remove uneeded sysconf things --- src/common/host_memory.cpp | 3 +-- src/common/memory_detect.cpp | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp index fa03b6d211..2f08d58b3b 100644 --- a/src/common/host_memory.cpp +++ b/src/common/host_memory.cpp @@ -438,7 +438,7 @@ static void* ChooseVirtualBase(size_t virtual_size) { #else static void* ChooseVirtualBase(size_t 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__) || defined(__OPENORBIS__) void* virtual_base = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_ALIGNED_SUPER, -1, 0); if (virtual_base != MAP_FAILED) return virtual_base; @@ -676,7 +676,6 @@ private: HostMemory::HostMemory(size_t backing_size_, size_t virtual_size_) : backing_size(backing_size_), virtual_size(virtual_size_) { #ifdef __OPENORBIS__ - Common::InitSwap(); LOG_WARNING(HW_Memory, "Platform doesn't support fastmem"); fallback_buffer.emplace(backing_size); backing_base = fallback_buffer->data(); diff --git a/src/common/memory_detect.cpp b/src/common/memory_detect.cpp index 5063b28b2d..65af4c9cc8 100644 --- a/src/common/memory_detect.cpp +++ b/src/common/memory_detect.cpp @@ -46,8 +46,6 @@ static MemoryInfo Detect() { sysctlbyname("vm.swapusage", &vmusage, &sizeof_vmusage, nullptr, 0); mem_info.TotalPhysicalMemory = ramsize; mem_info.TotalSwapMemory = vmusage.xsu_total; -#elif defined(__OPENORBIS__) - mem_info.TotalPhysicalMemory = mem_info.TotalSwapMemory = 0; #elif defined(__FreeBSD__) u_long physmem, swap_total; std::size_t sizeof_u_long = sizeof(u_long);