ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MemArena: Fix the launching of non-Wii games 

When we cleaned up the code to calculate the shm_position and total_mem
in one step, we sometimes skipped over certain views because they were
Wii-only. When looking at the total memory, we'd look at the last field,
whether or not it was skipped. Since Wii-only fields are the last view,
this meant that the shm_position was 0, since it was skipped, causing us
to map a 0-sized field. Fix this by explicitly returning the total size
from MemoryMap_InitializeViews.

Additionally, the shm_position was being calculated incorrectly because
it was adding up the shm_position *before* the mirror, rather than after
it. Fix this by adopting a scheme similar to what we had before.
This commit is contained in:
Jasper St. Pierre 2014-11-03 10:04:50 -08:00
parent 4cf8697957
commit e290a3d39c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/Common/MemArena.cpp
View File

@ -222,9 +222,10 @@ bail:
return false; return false;
} }
static void MemoryMap_InitializeViews(MemoryView *views, int num_views, u32 flags) static u32 MemoryMap_InitializeViews(MemoryView *views, int num_views, u32 flags)
{ {
u32 shm_position = 0; u32 shm_position = 0;
u32 last_position;
for (int i = 0; i < num_views; i++) for (int i = 0; i < num_views; i++)
{ {
@ -233,17 +234,19 @@ static void MemoryMap_InitializeViews(MemoryView *views, int num_views, u32 flag
SKIP(flags, views[i].flags); SKIP(flags, views[i].flags);
if (views[i].flags & MV_MIRROR_PREVIOUS)
shm_position = last_position;
views[i].shm_position = shm_position; views[i].shm_position = shm_position;
last_position = shm_position;
if (!(views[i].flags & MV_MIRROR_PREVIOUS)) shm_position += views[i].size;
shm_position += views[i].size;
} }
return shm_position;
} }
u8 *MemoryMap_Setup(MemoryView *views, int num_views, u32 flags, MemArena *arena) u8 *MemoryMap_Setup(MemoryView *views, int num_views, u32 flags, MemArena *arena)
{ {
MemoryMap_InitializeViews(views, num_views, flags); u32 total_mem = MemoryMap_InitializeViews(views, num_views, flags);
u32 total_mem = views[num_views - 1].shm_position;
arena->GrabSHMSegment(total_mem); arena->GrabSHMSegment(total_mem);