Skip to content
Snippets Groups Projects
Commit d299f7ed authored by bunnei's avatar bunnei
Browse files

Merge pull request #1794 from Subv/regression_fix

Memory: Fixed a regression caused by #1695 and #1689.
parents 18b517e2 64da2bf0
No related branches found
No related tags found
No related merge requests found
...@@ -55,6 +55,9 @@ void MemoryInit(u32 mem_type) { ...@@ -55,6 +55,9 @@ void MemoryInit(u32 mem_type) {
memory_regions[i].size = memory_region_sizes[mem_type][i]; memory_regions[i].size = memory_region_sizes[mem_type][i];
memory_regions[i].used = 0; memory_regions[i].used = 0;
memory_regions[i].linear_heap_memory = std::make_shared<std::vector<u8>>(); 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; base += memory_regions[i].size;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment