From 17df2400e2a35acde27cf0a3d225f9fdc7a32bce Mon Sep 17 00:00:00 2001 From: lizzie Date: Tue, 2 Dec 2025 20:29:12 -0500 Subject: [PATCH] [host_memory] remove unused fastmem fallback path basically nobody ever used that path, we instead soft-crash upon not being able to allocate **backing** storage, we do still attempt to allocate a virtual base through, but if backing storage fails for any reason whatsoever, we pretty much cant run the emulator anyways Signed-off-by: lizzie --- src/common/host_memory.cpp | 38 ++++++++++++-------------------------- src/common/host_memory.h | 3 --- 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp index 5400b97018..51ee0d333b 100644 --- a/src/common/host_memory.cpp +++ b/src/common/host_memory.cpp @@ -68,8 +68,8 @@ static int memfd_create(const char* name, unsigned int flags) { namespace Common { -constexpr size_t PageAlignment = 0x1000; -constexpr size_t HugePageSize = 0x200000; +[[maybe_unused]] constexpr size_t PageAlignment = 0x1000; +[[maybe_unused]] constexpr size_t HugePageSize = 0x200000; #ifdef _WIN32 @@ -692,30 +692,16 @@ private: #endif // ^^^ POSIX ^^^ -HostMemory::HostMemory(size_t backing_size_, size_t virtual_size_) - : backing_size(backing_size_), virtual_size(virtual_size_) { - try { - // Try to allocate a fastmem arena. - // The implementation will fail with std::bad_alloc on errors. - impl = - std::make_unique(AlignUp(backing_size, PageAlignment), - AlignUp(virtual_size, PageAlignment) + HugePageSize); - backing_base = impl->backing_base; - virtual_base = impl->virtual_base; - - if (virtual_base) { - // Ensure the virtual base is aligned to the L2 block size. - virtual_base = reinterpret_cast( - Common::AlignUp(reinterpret_cast(virtual_base), HugePageSize)); - virtual_base_offset = virtual_base - impl->virtual_base; - } - - } catch (const std::bad_alloc&) { - LOG_CRITICAL(HW_Memory, - "Fastmem unavailable, falling back to VirtualBuffer for memory allocation"); - fallback_buffer = std::make_unique>(backing_size); - backing_base = fallback_buffer->data(); - virtual_base = nullptr; +HostMemory::HostMemory(size_t backing_size_, size_t virtual_size_) : backing_size(backing_size_), virtual_size(virtual_size_) { + // Try to allocate a fastmem arena. + // The implementation will fail with std::bad_alloc on errors. + impl = std::make_unique(AlignUp(backing_size, PageAlignment), AlignUp(virtual_size, PageAlignment) + HugePageSize); + backing_base = impl->backing_base; + virtual_base = impl->virtual_base; + if (virtual_base) { + // Ensure the virtual base is aligned to the L2 block size. + virtual_base = reinterpret_cast(Common::AlignUp(uintptr_t(virtual_base), HugePageSize)); + virtual_base_offset = virtual_base - impl->virtual_base; } } diff --git a/src/common/host_memory.h b/src/common/host_memory.h index 72fbb05af7..a7cfe18779 100644 --- a/src/common/host_memory.h +++ b/src/common/host_memory.h @@ -79,9 +79,6 @@ private: u8* backing_base{}; u8* virtual_base{}; size_t virtual_base_offset{}; - - // Fallback if fastmem is not supported on this platform - std::unique_ptr> fallback_buffer; }; } // namespace Common