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

mGBA: Update SaveRAM mem domain to a hardcoded size. (#2311) 

* Revert "mgba - try resetting sram memdomain after frame advance, so sram autodetection can progress and feed into frontend. addresses #1620, maybe not in the best way"

This reverts commit 25327b510d. We decided exposing the whole buffer would be better than dealing with a variable size memory domain.

* mGBA: Update SaveRAM mem domain to a hardcoded size.
This commit is contained in:
RetroEdit 2020-08-29 18:38:02 +00:00 committed by GitHub
parent cdf20ff1be
commit 4456e84bf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs
View File

@ -111,7 +111,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
public IntPtr oam;
public IntPtr rom;
public IntPtr sram;
public int sram_size;
}
[BizImport(cc, Compatibility = true)]

17
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IMemoryDomains.cs
View File

@ -31,7 +31,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
mm.Add(_vram = new MemoryDomainIntPtr("VRAM", le, IntPtr.Zero, 96 * 1024, true, 4));
mm.Add(_oam = new MemoryDomainIntPtr("OAM", le, IntPtr.Zero, 1024, true, 4));
mm.Add(_rom = new MemoryDomainIntPtr("ROM", le, IntPtr.Zero, romsize, true, 4));
mm.Add(_sram = new MemoryDomainIntPtr("SRAM", le, IntPtr.Zero, 0, true, 4)); // size will be fixed in wireup
// 128 KB is the max size for GBA savedata
// mGBA does not know a game's save type (and as a result actual savedata size) on startup.
// Instead, BizHawk's savedata buffer will be accessed directly for a consistent interface.
mm.Add(_sram = new MemoryDomainIntPtr("SRAM", le, IntPtr.Zero, 128 * 1024, true, 4));
mm.Add(_cwram = new MemoryDomainDelegate("Combined WRAM", (256 + 32) * 1024, le, null, null, 4));
mm.Add(new MemoryDomainDelegate("System Bus", 0x10000000, le,
@ -60,16 +63,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
WireMemoryDomainPointers();
}
private void WireMemoryDomainPointers_SaveRam()
{
var s = new LibmGBA.MemoryAreas();
LibmGBA.BizGetMemoryAreas(Core, s);
_sram.Data = s.sram;
if (s.sram == IntPtr.Zero) s.sram_size = 0;
_sram.SetSize(s.sram_size);
}
private void WireMemoryDomainPointers()
{
var s = new LibmGBA.MemoryAreas();
@ -83,8 +76,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
_oam.Data = s.oam;
_rom.Data = s.rom;
_sram.Data = s.sram;
if (s.sram == IntPtr.Zero) s.sram_size = 0;
_sram.SetSize(s.sram_size);
// special combined ram memory domain
_cwram.Peek =

4
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
View File

@ -139,10 +139,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
(short)controller.AxisValue("Tilt Z"),
(byte)(255 - controller.AxisValue("Light Sensor")));
//autodetection may have progressed.
//this isn't a great time to do it, but we have to do it some time. maybe it's the best time.
WireMemoryDomainPointers_SaveRam();
if (IsLagFrame)
{
LagCount++;