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

libsnes: Cache region from core once at start 

The region value in the comm struct is set once and then gets wiped out later.  I don't know what wipes it, but so many things have their hands on that, it's not surprising.  Someone knew about this and handled _mapper appropriately, but not _region.

Fixes #2503
This commit is contained in:
nattthebear 2020-12-15 08:51:08 -05:00
parent a8e2a420f0
commit eeca40e072
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IMemoryDomains.cs
View File

@ -11,6 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
private readonly List<MemoryDomain> _memoryDomainList = new List<MemoryDomain>(); private readonly List<MemoryDomain> _memoryDomainList = new List<MemoryDomain>();
private IMemoryDomains _memoryDomains; private IMemoryDomains _memoryDomains;
private LibsnesApi.SNES_MAPPER? _mapper; private LibsnesApi.SNES_MAPPER? _mapper;
private LibsnesApi.SNES_REGION? _region;
// works for WRAM, garbage for anything else // works for WRAM, garbage for anything else
private static int? FakeBusMap(int addr) private static int? FakeBusMap(int addr)

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IRegionable.cs
View File

@ -4,7 +4,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
{ {
public partial class LibsnesCore : IRegionable public partial class LibsnesCore : IRegionable
{ {
public DisplayType Region => Api.Region == LibsnesApi.SNES_REGION.NTSC public DisplayType Region => _region == LibsnesApi.SNES_REGION.NTSC
? DisplayType.NTSC ? DisplayType.NTSC
: DisplayType.PAL; : DisplayType.PAL;
} }

3
src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
View File

@ -173,7 +173,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
} }
} }
if (Api.Region == LibsnesApi.SNES_REGION.NTSC) if (_region == LibsnesApi.SNES_REGION.NTSC)
{ {
// similar to what aviout reports from snes9x and seems logical from bsnes first principles. bsnes uses that numerator (ntsc master clockrate) for sure. // similar to what aviout reports from snes9x and seems logical from bsnes first principles. bsnes uses that numerator (ntsc master clockrate) for sure.
VsyncNumerator = 21477272; VsyncNumerator = 21477272;
@ -484,6 +484,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
: Api.CMD_load_cartridge_super_game_boy(_currLoadParams.rom_xml, _currLoadParams.rom_data, _currLoadParams.rom_size, _currLoadParams.dmg_data); : Api.CMD_load_cartridge_super_game_boy(_currLoadParams.rom_xml, _currLoadParams.rom_data, _currLoadParams.rom_size, _currLoadParams.dmg_data);
_mapper = Api.Mapper; _mapper = Api.Mapper;
_region = Api.Region;
return result; return result;
} }