summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2016-05-14 18:24:19 +0200
committerSubv <subv2112@gmail.com>2016-05-14 18:24:19 +0200
commit64da2bf0cddd885968fd62b65610aff640166a92 (patch)
treee70bdacfb80ef0fc70e1ad53f4dd63f6d82e7c8e /src/core
parentMerge pull request #1689 from Subv/shmem (diff)
downloadyuzu-64da2bf0cddd885968fd62b65610aff640166a92.tar
yuzu-64da2bf0cddd885968fd62b65610aff640166a92.tar.gz
yuzu-64da2bf0cddd885968fd62b65610aff640166a92.tar.bz2
yuzu-64da2bf0cddd885968fd62b65610aff640166a92.tar.lz
yuzu-64da2bf0cddd885968fd62b65610aff640166a92.tar.xz
yuzu-64da2bf0cddd885968fd62b65610aff640166a92.tar.zst
yuzu-64da2bf0cddd885968fd62b65610aff640166a92.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/memory.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp
index 4be20db22..17ae87aef 100644
--- a/src/core/hle/kernel/memory.cpp
+++ b/src/core/hle/kernel/memory.cpp
@@ -55,6 +55,9 @@ void MemoryInit(u32 mem_type) {
memory_regions[i].size = memory_region_sizes[mem_type][i];
memory_regions[i].used = 0;
memory_regions[i].linear_heap_memory = std::make_shared<std::vector<u8>>();
+ // Reserve enough space for this region of FCRAM.
+ // We do not want this block of memory to be relocated when allocating from it.
+ memory_regions[i].linear_heap_memory->reserve(memory_regions[i].size);
base += memory_regions[i].size;
}