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

N64: Rescue save ram from the clutches of race conditions

This commit is contained in:
pjgat09 2013-05-09 00:36:01 +00:00
parent bf7544793d
commit 7becee2284
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
View File

@ -119,9 +119,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
public byte[] ReadSaveRam()
{
byte[] ret = new byte[0x800 + 4 * 0x8000];
api.SaveSaveram(ret);
return ret;
return api.SaveSaveram();
}
public void StoreSaveRam(byte[] data)

26
BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
View File

@ -673,14 +673,33 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
m64pCoreLoadState(buffer);
}
byte[] saveram_backup;
public void InitSaveram()
{
m64pinit_saveram();
}
public void SaveSaveram(byte[] dest)
public byte[] SaveSaveram()
{
m64psave_saveram(dest);
if (disposed)
{
if (saveram_backup != null)
{
return saveram_backup;
}
else
{
// This shouldn't happen!!
return new byte[0x800 + 4 * 0x8000];
}
}
else
{
byte[] dest = new byte[0x800 + 4 * 0x8000];
m64psave_saveram(dest);
return dest;
}
}
public void LoadSaveram(byte[] src)
@ -697,6 +716,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
//m64pEmulator.Join();
while (emulator_running) { }
// Backup the saveram in case bizhawk wants to get at is after we've freed the libraries
saveram_backup = SaveSaveram();
bizhawkCore.resampler.Dispose();
bizhawkCore.resampler = null;