From 6868ad4326e3744ae784310bd34cc15bb87195f9 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Mon, 16 Apr 2018 16:33:25 +1000 Subject: [PATCH] Bus: Don't reserve entire fastmem region on Android --- src/core/bus.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/bus.cpp b/src/core/bus.cpp index 6d4e6728e..f4213a06c 100644 --- a/src/core/bus.cpp +++ b/src/core/bus.cpp @@ -382,6 +382,8 @@ void UpdateFastmemViews(CPUFastmemMode mode) }; auto ReserveRegion = [](u32 start_address, u32 end_address_inclusive) { + // We don't reserve memory regions on Android because the app could be subject to address space size limitations. +#ifndef __ANDROID__ Assert(end_address_inclusive >= start_address); u8* map_address = m_fastmem_base + start_address; auto view = m_memory_arena.CreateReservedView(end_address_inclusive - start_address + 1, map_address); @@ -392,6 +394,7 @@ void UpdateFastmemViews(CPUFastmemMode mode) } m_fastmem_reserved_views.push_back(std::move(view.value())); +#endif }; // KUSEG - cached